diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index f8f726572..8ccb07ecc 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -5089,12 +5089,13 @@
     RoomContextualMenuViewController *roomContextualMenuViewController = [RoomContextualMenuViewController instantiateWith:contextualMenuItems];
     roomContextualMenuViewController.delegate = self;
     
+    [self enableOverlayContainerUserInteractions:YES];
+    
     [self.roomContextualMenuPresenter presentWithRoomContextualMenuViewController:roomContextualMenuViewController
                                                                              from:self
                                                                                on:self.overlayContainerView
                                                                          animated:YES
                                                                        completion:^{
-                                                                           [self contextualMenuAnimationCompletionAfterBeingShown:YES];
                                                                        }];
     
     if (RiotSettings.shared.messageReaction && [cell isKindOfClass:MXKRoomBubbleTableViewCell.class])
@@ -5153,7 +5154,7 @@
     }
     
     [self.roomContextualMenuPresenter hideContextualMenuWithAnimated:animated completion:^{
-        [self contextualMenuAnimationCompletionAfterBeingShown:NO];
+        [self enableOverlayContainerUserInteractions:NO];
         
         if (completion)
         {
@@ -5162,11 +5163,11 @@
     }];
 }
 
-- (void)contextualMenuAnimationCompletionAfterBeingShown:(BOOL)isShown
+- (void)enableOverlayContainerUserInteractions:(BOOL)enableOverlayContainerUserInteractions
 {
-    self.inputToolbarView.editable = !isShown;
-    self.bubblesTableView.scrollsToTop = !isShown;
-    self.overlayContainerView.userInteractionEnabled = isShown;
+    self.inputToolbarView.editable = !enableOverlayContainerUserInteractions;
+    self.bubblesTableView.scrollsToTop = !enableOverlayContainerUserInteractions;
+    self.overlayContainerView.userInteractionEnabled = enableOverlayContainerUserInteractions;
 }
 
 #pragma mark - RoomContextualMenuViewControllerDelegate