diff --git a/Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.m b/Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.m
index 27081c8e3..7a923bb7b 100644
--- a/Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/OWSMessagesComposerTextView.m
@@ -11,6 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)canBecomeFirstResponder
 {
+    // Intercept to scroll to bottom when text view is tapped.
+    [self.textViewPasteDelegate textViewDidChangeSize];
+
     return YES;
 }