diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 18224c196..066226e29 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -21,8 +21,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?).sort_by{|a| ids.index(a.id.to_s)} : []
+    journal.attachments.select(&:thumbnailable?)
   end
 
   # Returns the action links for an issue journal
diff --git a/app/models/journal.rb b/app/models/journal.rb
index a4efcdbee..e60295c34 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -143,7 +143,7 @@ class Journal < ActiveRecord::Base
 
   def attachments
     ids = details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
-    Attachment.where(id: ids).to_a
+    Attachment.where(id: ids).sort_by {|a| ids.index(a.id.to_s)}
   end
 
   # Returns a string of css classes