diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index bae229924..0cbc03645 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -972,17 +972,17 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [self updateNavigationBarSubtitleLabel];
     [self updateBackButtonUnreadCount];
 
+    if (_composeOnOpen && !self.inputToolbar.hidden) {
+        [self popKeyBoard];
+        _composeOnOpen = NO;
+    }
+    if (_callOnOpen) {
+        [self callAction];
+        _callOnOpen = NO;
+    }
+
     if (!self.viewHasEverAppeared) {
         [self.inputToolbar endEditing:YES];
-
-        if (_composeOnOpen && !self.inputToolbar.hidden) {
-            [self popKeyBoard];
-            _composeOnOpen = NO;
-        }
-        if (_callOnOpen) {
-            [self callAction];
-            _callOnOpen = NO;
-        }
     }
     self.viewHasEverAppeared = YES;
 }