diff --git a/CHANGES.rst b/CHANGES.rst
index e62d281e93..65744cf74f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,8 @@ Changes to be released in next version
  * Fix crash on Apple Silicon Macs.
  * Media Picker: Generate video thumbnails with the correct orientation (#4515).
  * Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
- * Use different title for scan button for self verification (#4525)
+ * Use different title for scan button for self verification (#4525).
+ * it's easy for the back button to trigger a leftpanel reveal (#4438).
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index 0efc1c03c4..cb28c4427c 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -245,9 +245,9 @@ final class TabBarCoordinator: NSObject, TabBarCoordinatorType {
     }
     
     private func setupSideMenuGestures() {
-        self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: self.masterNavigationController.view)
-        
-        self.parameters.appNavigator.sideMenu.addPanGestureToPresent(to: self.masterNavigationController.navigationBar)
+        if let rootViewController = self.masterNavigationController.viewControllers.first {
+            self.parameters.appNavigator.sideMenu.addScreenEdgePanGesturesToPresent(to: rootViewController.view)
+        }
     }
     
     // MARK: Navigation