diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 56f884d15c..18bc35f72a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -77,10 +77,20 @@ class VectorSettingsLabsFragment :
 
         findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_NEW_APP_LAYOUT_KEY)?.let { pref ->
             pref.isVisible = vectorFeatures.isNewAppLayoutFeatureEnabled()
+
+            pref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                onNewLayoutPreferenceClicked()
+                true
+            }
         }
 
+        configureUnreadNotificationsAsTabPreference()
+    }
+
+    private fun configureUnreadNotificationsAsTabPreference() {
         findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB)?.let { pref ->
             pref.isVisible = !vectorFeatures.isNewAppLayoutFeatureEnabled()
+            pref.isEnabled = !vectorPreferences.isNewAppLayoutEnabled()
         }
     }
 
@@ -123,4 +133,11 @@ class VectorSettingsLabsFragment :
         displayLoadingView()
         MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
     }
+
+    /**
+     * Action when new layout preference switch is actually clicked.
+     */
+    private fun onNewLayoutPreferenceClicked() {
+        configureUnreadNotificationsAsTabPreference()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index d692580931..3c8ec56713 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -103,6 +103,7 @@ class VectorSettingsPreferencesFragment :
 
         findPreference<Preference>(VectorPreferences.SETTINGS_PREF_SPACE_CATEGORY)!!.let { pref ->
             pref.isVisible = !vectorFeatures.isNewAppLayoutFeatureEnabled()
+            pref.isEnabled = !vectorPreferences.isNewAppLayoutEnabled()
         }
 
         // Url preview