diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 285e15832..457ff8807 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1587,10 +1587,6 @@ public class ConversationFragment extends XmppFragment
             return;
         }
 
-        if (oldReplyTo == message) {
-            return;
-        }
-
         SpannableStringBuilder body = message.getBodyForReplyPreview(activity.xmppConnectionService);
 
         if (message.isFileOrImage() && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) {
@@ -1623,9 +1619,10 @@ public class ConversationFragment extends XmppFragment
         binding.contextPreviewText.setText(body);
         binding.contextPreviewAuthor.setText(message.getAvatarName());
         binding.contextPreview.setVisibility(View.VISIBLE);
-
-
-        showKeyboard(binding.textinput);
+        
+        if (oldReplyTo != message) {
+            showKeyboard(binding.textinput);
+        }
     }
 
     private void scrollToReply(Message message) {