diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index ee6035b8fe..e4a613128e 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -1327,6 +1327,8 @@ static NSTimeInterval launchStartedAt;
     self.window.rootViewController = navigationController;
 
     [AppUpdateNag.sharedInstance showAppUpgradeNagIfNecessary];
+
+    [UIViewController attemptRotationToDeviceOrientation];
 }
 
 #pragma mark - status bar touches
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 8203c41f3f..08e8c14883 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -748,8 +748,6 @@ typedef enum : NSUInteger {
         OWSLogVerbose(@"First viewWillAppear took: %.2fms", appearenceDuration * 1000);
     }
     [self updateInputToolbarLayout];
-
-    [UIViewController attemptRotationToDeviceOrientation];
 }
 
 - (NSArray<id<ConversationViewItem>> *)viewItems
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 1d66b0151a..70f330944f 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -645,8 +645,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     }
 
     [self.searchResultsController viewWillAppear:animated];
-
-    [UIViewController attemptRotationToDeviceOrientation];
 }
 
 - (void)viewWillDisappear:(BOOL)animated