diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
index 591c5d0d4..0de00f22c 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@@ -136,6 +136,18 @@ NS_ASSUME_NONNULL_BEGIN
     return YES;
 }
 
+- (BOOL)becomeFirstResponder
+{
+    DDLogDebug(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
+    return [super becomeFirstResponder];
+}
+
+- (BOOL)resignFirstResponder
+{
+    DDLogDebug(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
+    return [super resignFirstResponder];
+}
+
 - (BOOL)pasteboardHasPossibleAttachment
 {
     // We don't want to load/convert images more than once so we
@@ -172,13 +184,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - UITextViewDelegate
 
-- (void)textViewDidBeginEditing:(UITextView *)textView
-{
-    // TODO: Is this necessary?
-
-    [textView becomeFirstResponder];
-}
-
 - (void)textViewDidChange:(UITextView *)textView
 {
     OWSAssert(self.textViewToolbarDelegate);
@@ -188,11 +193,6 @@ NS_ASSUME_NONNULL_BEGIN
     [self.textViewToolbarDelegate textViewDidChange:self];
 }
 
-- (void)textViewDidEndEditing:(UITextView *)textView
-{
-    [textView resignFirstResponder];
-}
-
 #pragma mark - Key Commands
 
 - (nullable NSArray<UIKeyCommand *> *)keyCommands