diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 257286b03a..0edb477c7f 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -211,14 +211,20 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
     if (self.attachmentToApprove) {
         self.contentView.hidden = YES;
         self.attachmentApprovalView.hidden = NO;
-        // Ensure the keyboard is dismissed.
-        [self.inputTextView resignFirstResponder];
 
         self.contentContraints = @[
             [self.attachmentApprovalView autoSetDimension:ALDimensionHeight toSize:300.f],
         ];
 
+        [self setNeedsLayout];
         [self layoutIfNeeded];
+
+        // Ensure the keyboard is dismissed.
+        //
+        // NOTE: We need to do this _last_ or the layout changes in the input toolbar
+        //       will be inadvertently animated.
+        [self.inputTextView resignFirstResponder];
+
         return;
     }