3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/application-legacy.js b/app/assets/javascripts/application-legacy.js
index deaaa66b6..f7c1de95c 100644
--- a/app/assets/javascripts/application-legacy.js
+++ b/app/assets/javascripts/application-legacy.js
@@ -426,7 +426,7 @@ function showIssueHistory(journal, url) {
       tab_content.find('.journal').show();
       tab_content.find('.journal:not(.has-notes)').hide();
       tab_content.find('.journal .wiki').show();
-      tab_content.find('.journal .contextual .journal-actions').show();
+      tab_content.find('.journal .contextual .journal-actions > *').show();
 
       // always show thumbnails in notes tab
       var thumbnails = tab_content.find('.journal .thumbnails');
@@ -439,13 +439,15 @@ function showIssueHistory(journal, url) {
       tab_content.find('.journal:not(.has-details)').hide();
       tab_content.find('.journal .wiki').hide();
       tab_content.find('.journal .thumbnails').hide();
-      tab_content.find('.journal .contextual .journal-actions').hide();
+      tab_content.find('.journal .contextual .journal-actions > *').hide();
+      // Show reaction button in properties tab
+      tab_content.find('.journal .contextual .journal-actions .reaction-button-wrapper').show();
       break;
     default:
       tab_content.find('.journal').show();
       tab_content.find('.journal .wiki').show();
       tab_content.find('.journal .thumbnails').show();
-      tab_content.find('.journal .contextual .journal-actions').show();
+      tab_content.find('.journal .contextual .journal-actions > *').show();
   }
 
   return false;
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 66f81033e..7f1a449fb 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -41,9 +41,9 @@ module JournalsHelper
                                )
     end
 
-    if journal.notes.present?
-      links << reaction_button(journal)
+    links << reaction_button(journal)
 
+    if journal.notes.present?
       if options[:reply_links]
         url = quoted_issue_path(issue, :journal_id => journal, :journal_indice => indice)
         links << quote_reply(url, "#journal-#{journal.id}-notes", icon_only: true)
diff --git a/app/helpers/reactions_helper.rb b/app/helpers/reactions_helper.rb
index 88d7f5c35..97943e71c 100644
--- a/app/helpers/reactions_helper.rb
+++ b/app/helpers/reactions_helper.rb
@@ -82,7 +82,7 @@ module ReactionsHelper
   end
 
   def reaction_button_wrapper(object, &)
-    tag.span(data: { 'reaction-button-id': reaction_id_for(object) }, &)
+    tag.span(class: 'reaction-button-wrapper', data: { 'reaction-button-id': reaction_id_for(object) }, &)
   end
 
   def build_reaction_tooltip(visible_user_names, count)