1 files changed, 16 insertions, 8 deletions

diff --git a/packages/renderer/src/components/locationBar/LocationBar.tsx b/packages/renderer/src/components/locationBar/LocationBar.tsx
index 54ead8e..c290722 100644
--- a/packages/renderer/src/components/locationBar/LocationBar.tsx
+++ b/packages/renderer/src/components/locationBar/LocationBar.tsx
@@ -22,13 +22,16 @@ import { styled } from '@mui/material/styles';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 
+import type Service from '../../stores/Service';
 import { useStore } from '../StoreProvider';
 
 import ExtraButtons from './ExtraButtons';
 import LocationTextField from './LocationTextField';
 import NavigationButtons from './NavigationButtons';
 
-export const LOCATION_BAR_ID = 'Sophie-LocationBar';
+export function getLocaltionBarID(service: Service): string {
+  return `Sophie-${service.id}-LocationBar`;
+}
 
 const LocationBarRoot = styled('header', {
   name: 'LocationBar',
@@ -41,17 +44,22 @@ const LocationBarRoot = styled('header', {
   borderBottom: `1px solid ${theme.palette.divider}`,
 }));
 
-function LocationBar(): JSX.Element {
+function LocationBar({ service }: { service: Service }): JSX.Element {
   const {
-    shared: { locationBarVisible },
-    settings: { selectedService },
+    settings: { showLocationBar },
   } = useStore();
 
+  const { alwaysShowLocationBar } = service;
+  const locationBarVisible = showLocationBar || alwaysShowLocationBar;
+
   return (
-    <LocationBarRoot id={LOCATION_BAR_ID} hidden={!locationBarVisible}>
-      <NavigationButtons service={selectedService} />
-      <LocationTextField service={selectedService} />
-      <ExtraButtons service={selectedService} />
+    <LocationBarRoot
+      id={getLocaltionBarID(service)}
+      hidden={!locationBarVisible}
+    >
+      <NavigationButtons service={service} />
+      <LocationTextField service={service} />
+      <ExtraButtons service={service} />
     </LocationBarRoot>
   );
 }