diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
index a4577d101c..6adb284ad5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java
@@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.conversation;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 
+import org.thoughtcrime.securesms.util.ViewUtil;
+
 /**
  * Activity which encapsulates a conversation for a Bubble window.
  *
@@ -16,6 +18,12 @@ public class BubbleConversationActivity extends ConversationActivity {
     return true;
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    ViewUtil.hideKeyboard(this, getComposeText());
+  }
+
   @Override
   public void onInitializeToolbar(@NonNull Toolbar toolbar) {
   }