1 files changed, 14 insertions, 10 deletions

diff --git a/packages/shared/src/stores/SharedStoreBase.ts b/packages/shared/src/stores/SharedStoreBase.ts
index 4526c95..786dc5f 100644
--- a/packages/shared/src/stores/SharedStoreBase.ts
+++ b/packages/shared/src/stores/SharedStoreBase.ts
@@ -19,12 +19,12 @@
  */
 
 import {
-  IJsonPatch,
-  Instance,
+  type IJsonPatch,
+  type Instance,
   types,
-  SnapshotIn,
-  SnapshotOut,
-  IAnyModelType,
+  type SnapshotIn,
+  type SnapshotOut,
+  type IAnyModelType,
 } from 'mobx-state-tree';
 
 import GlobalSettingsBase from './GlobalSettingsBase.js';
@@ -51,6 +51,10 @@ export function defineSharedStoreModel<
       writingDirection: types.optional(WritingDirection, 'ltr'),
     })
     .views((self) => ({
+      get alwaysHideLocationBar(): boolean {
+        const settings = self.settings as GlobalSettingsBase;
+        return settings.selectedService === undefined;
+      },
       get alwaysShowLocationBar(): boolean {
         const settings = self.settings as GlobalSettingsBase;
         const selectedService = settings.selectedService as
@@ -62,14 +66,14 @@ export function defineSharedStoreModel<
     .views((self) => ({
       get locationBarVisible(): boolean {
         const settings = self.settings as GlobalSettingsBase;
-        return settings.showLocationBar || self.alwaysShowLocationBar;
-      },
-      get canToggleLocationBar(): boolean {
         return (
-          !self.alwaysShowLocationBar &&
-          self.settings.selectedService !== undefined
+          !self.alwaysHideLocationBar &&
+          (self.alwaysShowLocationBar || settings.showLocationBar)
         );
       },
+      get canToggleLocationBar(): boolean {
+        return !(self.alwaysHideLocationBar || self.alwaysShowLocationBar);
+      },
     }));
 }