diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index d947f8233..6bd961950 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -22,7 +22,7 @@ module JournalsHelper
   # Returns the attachments of a journal that are displayed as thumbnails
   def journal_thumbnail_attachments(journal)
     ids = journal.details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
-    ids.any? ? Attachment.where(:id => ids).select(&:thumbnailable?) : []
+    ids.any? ? Attachment.where(:id => ids).select(&:thumbnailable?).sort_by{ |o| ids.index(o.id.to_s)} : []
   end
 
   # Returns the action links for an issue journal
diff --git a/test/helpers/journals_helper_test.rb b/test/helpers/journals_helper_test.rb
index a3475c6ab..2fca1ed89 100644
--- a/test/helpers/journals_helper_test.rb
+++ b/test/helpers/journals_helper_test.rb
@@ -49,4 +49,30 @@ class JournalsHelperTest < Redmine::HelperTest
     assert_kind_of Attachment, thumbnails.first
     assert_equal 'image.png', thumbnails.first.filename
   end
+
+  def test_journal_thumbnail_attachments_should_be_in_the_same_order_as_the_journal_details
+    skip unless convert_installed?
+    set_tmp_attachments_directory
+    issue = Issue.generate!
+
+    # If the order of Attachment id and journal.details is different, the order will be the same as journal_details.
+    attachment1 = Attachment.generate!(:file => mock_file_with_options(:original_filename => 'image1.png'), :author => User.find(1))
+    attachment2 = Attachment.generate!(:file => mock_file_with_options(:original_filename => 'image2.png'), :author => User.find(1))
+    journal = Journal.create!(:journalized => issue, :user_id => 1)
+    JournalDetail.create!(
+        :journal => journal, :property => 'attachment',
+        :prop_key => attachment2.id.to_s,
+        :value => 'image2.png'
+      )
+    JournalDetail.create!(
+        :journal => journal, :property => 'attachment',
+        :prop_key => attachment1.id.to_s,
+        :value => 'image1.png'
+      )
+    journal.reload
+    thumbnails = journal_thumbnail_attachments(journal)
+    assert_equal 2, thumbnails.count
+    assert_equal 2, journal.details.count
+    assert_equal journal.details.map(&:value), thumbnails.map(&:filename)
+  end
 end