diff --git a/src/plugins/sib-reactions.js b/src/plugins/sib-reactions.js
index 510620b1aa1382b21f0ad9f26f40843c1983bf74..4b9ce8504b0500df4a0b55bf3e02cdb08e090a6d 100644
--- a/src/plugins/sib-reactions.js
+++ b/src/plugins/sib-reactions.js
@@ -359,6 +359,10 @@ converse.plugins.add('sib-reactions', {
      * This is the first method of adding an emoji if there are none yet.
      */
     api.listen.on('getMessageActionButtons', (el, buttons) => {
+      if (el.is_retracted || el.correcting) {
+        return buttons;
+      }
+
       buttons.push({
         'i18n_text': __('React'),
         'handler': ev => MessageMixin.openEmojiPicker.call(el, ev),
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 3dd7240bcbc31c5430f8b70a24591b6473e56044..0bb89bb150f32e495d850c753300b792aab2c7fc 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -910,6 +910,12 @@
   //  Reactions
   // ---------------------------------
 
+  .chat-msg__actions--inline {
+    .chat-msg__action-react {
+      order: -1;
+    }
+  }
+
   .chat-msg:not(:hover) .chat-msg--react {
     display: none;
   }