diff --git a/src/app/templates/client/Client.jsx b/src/app/templates/client/Client.jsx
index 2714e749..8ff6e0ce 100644
--- a/src/app/templates/client/Client.jsx
+++ b/src/app/templates/client/Client.jsx
@@ -37,10 +37,14 @@ function Client() {
   function onRoomSelected() {
     navWrapperRef.current?.classList.add(classNameHidden);
     roomWrapperRef.current?.classList.remove(classNameHidden);
-    selectRoom(navigation.selectedRoomId);
+    if (settings.hideNavigation) {
+      selectRoom(navigation.selectedRoomId);
+      navWrapperRef.current?.classList.add(toggleHidden);
+    }
   }
   function onNavigationSelected() {
     navWrapperRef.current?.classList.remove(classNameHidden);
+    navWrapperRef.current?.classList.remove(toggleHidden);
     roomWrapperRef.current?.classList.add(classNameHidden);
   }
   function onNavigationToggled() {