diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 1cfe8bcd28..42831fce10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2324,14 +2324,17 @@ class ConversationFragment :
 
     val additionalScrollOffset = 54.dp
     if (isVisible) {
-      bottomActionBar.visibility = View.INVISIBLE
+      ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation)
       animationsAllowed = false
 
       bottomActionBar.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
         override fun onGlobalLayout() {
+          if (bottomActionBar.measuredHeight == 0) {
+            return
+          }
+
           bottomActionBar.viewTreeObserver.removeOnGlobalLayoutListener(this)
 
-          ViewUtil.animateIn(bottomActionBar, bottomActionBar.enterAnimation)
           container.hideInput()
           inputPanel.setHideForSelection(true)