diff --git a/package.json b/package.json
index 65b234b06..a45b632cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.9.16",
+	"version": "12.119.0-calc.9.17",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 593252a74..252f8fc1c 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -65,10 +65,7 @@
 		<div
 			v-if="widgetsShowing"
 			class="widgetsDrawer-back _modalBg"
-			@click="widgetsShowing = false"
-			@touchstart.passive="widgetsShowing = false"
-		></div>
-	</transition>
+			@click="widgetsShowing = false"let
 
 	<transition :name="$store.state.animation ? 'widgetsDrawer' : ''">
 		<XWidgets v-if="widgetsShowing" class="widgetsDrawer"/>
@@ -107,7 +104,8 @@ window.addEventListener('resize', () => {
 	isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD;
 });
 
-let buttonAnimIndex = ref(0);
+const buttonAnimIndex = ref(0);
+const drawerMenuShowing = ref(false);
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 const widgetsEl = $ref<HTMLElement>();
@@ -131,27 +129,24 @@ const menuIndicated = computed(() => {
 });
 
 function updateButtonState(): void {
-	let routerState = window.location.href;
-	let secondaryRouterState = mainRouter.currentRoute.value.name;
-	if (secondaryRouterState != null && secondaryRouterState === 'index') {
+	let routerState = window.location.pathname;
+	if (routerState === '/') {
 		buttonAnimIndex.value = 0;
 		return;
 	}
-	if (routerState.includes('notifications')) {
+	if (routerState.includes('/my/notifications')) {
 		buttonAnimIndex.value = 1;
+		return;
 	}
-	else if (routerState.includes('messaging')) {
+	if (routerState.includes('/my/messaging')) {
 		buttonAnimIndex.value = 2;
+		return;
 	}
-	else {
-		buttonAnimIndex.value = 3;
-	}
+	buttonAnimIndex.value = 3;
 }
 
 updateButtonState();
 
-const drawerMenuShowing = ref(false);
-
 mainRouter.on('change', () => {
 	drawerMenuShowing.value = false;
 	updateButtonState();