diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
index 3e6db12e0c..79b10b5ff7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/HidingLinearLayout.java
@@ -56,7 +56,10 @@ public class HidingLinearLayout extends LinearLayout {
   }
 
   public void show() {
-    if (!isEnabled() || getVisibility() == VISIBLE) return;
+    if (!isEnabled()) return;
+
+    clearAnimation();
+    if (getVisibility() == VISIBLE) return;
 
     setVisibility(VISIBLE);