diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 454666edb..9b9fb12ba 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1206,6 +1206,8 @@ typedef enum : NSUInteger {
     [super viewWillDisappear:animated];
 
     self.isViewCompletelyAppeared = NO;
+
+    [[OWSWindowManager sharedManager] hideMenuActionsWindow];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -2558,9 +2560,6 @@ typedef enum : NSUInteger {
     [self dismissViewControllerAnimated:NO completion:nil];
 }
 
-// TODO override dismissViewController to dismiss any presented MessagesActionSheet?
-// e.g. if we have any remaining dismiss-and-present logic remaining?
-
 #pragma mark - CNContactViewControllerDelegate
 
 - (void)contactViewController:(CNContactViewController *)viewController
diff --git a/SignalMessaging/utils/OWSWindowManager.m b/SignalMessaging/utils/OWSWindowManager.m
index dd35b9cb1..1d128890d 100644
--- a/SignalMessaging/utils/OWSWindowManager.m
+++ b/SignalMessaging/utils/OWSWindowManager.m
@@ -269,6 +269,8 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
 
 - (void)showMenuActionsWindow:(UIViewController *)menuActionsViewController
 {
+    OWSAssert(self.menuActionsViewController == nil);
+
     self.menuActionsViewController = menuActionsViewController;
     self.menuActionsWindow.rootViewController = menuActionsViewController;