1 files changed, 6 insertions, 2 deletions

diff --git a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
index 7fc559d..c697170 100644
--- a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
+++ b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
@@ -28,7 +28,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useStore } from '../StoreProvider';
-import { LOCATION_BAR_ID } from '../locationBar/LocationBar';
+import { getLocaltionBarID } from '../locationBar/LocationBar';
 
 function ToggleLocationBarIcon({
   loading,
@@ -54,13 +54,17 @@ function ToggleLocationBarButton(): JSX.Element {
   const { selectedService } = settings;
 
   return (
+    /* eslint-disable react/jsx-props-no-spreading -- Conditionally set the aria-controls prop. */
     <IconButton
       disabled={!canToggleLocationBar}
       aria-pressed={locationBarVisible}
-      aria-controls={LOCATION_BAR_ID}
+      {...(selectedService === undefined
+        ? {}
+        : { 'aria-controls': getLocaltionBarID(selectedService) })}
       aria-label={t('toolbar.toggleLocationBar')}
       onClick={() => settings.toggleLocationBar()}
     >
+      {/* eslint-enable react/jsx-props-no-spreading */}
       <ToggleLocationBarIcon
         loading={selectedService?.loading ?? false}
         show={locationBarVisible}