diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index 566bc0d69a..18979d8c4b 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -50,7 +50,19 @@
 		goto('/user/login')
 	}
 
-	$: $page.url && userSettings != undefined && superadminSettings != undefined && onQueryChange()
+	$: $page.url &&
+		userSettings != undefined &&
+		superadminSettings != undefined &&
+		onQueryChangeSettings()
+	$: $page.url && onQueryChange()
+
+	function onQueryChangeSettings() {
+		if (userSettings && $page.url.hash === USER_SETTINGS_HASH) {
+			userSettings.openDrawer()
+		} else if (superadminSettings && $page.url.hash === SUPERADMIN_SETTINGS_HASH) {
+			superadminSettings.openDrawer()
+		}
+	}
 
 	function onQueryChange() {
 		let queryWorkspace = $page.url.searchParams.get('workspace')
@@ -58,11 +70,6 @@
 			$workspaceStore = queryWorkspace
 		}
 
-		if (userSettings && $page.url.hash === USER_SETTINGS_HASH) {
-			userSettings.openDrawer()
-		} else if (superadminSettings && $page.url.hash === SUPERADMIN_SETTINGS_HASH) {
-			superadminSettings.openDrawer()
-		}
 		menuHidden = $page.url.searchParams.get('nomenubar') === 'true'
 	}