diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 246647332..72599d0bc 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -57,7 +57,13 @@ onMounted(() => stateStore.setMounted());
                     </q-tooltip>
                     <PinnedModules />
                 </q-btn>
-                <q-btn flat @click="$emit('onToggleRightDrawer')" round dense icon="menu">
+                <q-btn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
                     <q-tooltip bottom anchor="bottom right">
                         {{ t('globals.collapseMenu') }}
                     </q-tooltip>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 69c436ee9..328b93f20 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -12,13 +12,13 @@ import TeleportSlot from 'components/ui/TeleportSlot.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
 
-const state = useStateStore();
+const stateStore = useStateStore();
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
 
-onMounted(() => state.toggleRightDrawer());
-onUnmounted(() => state.toggleRightDrawer());
+onMounted(() => stateStore.toggleRightDrawer());
+onUnmounted(() => stateStore.toggleRightDrawer());
 
 function stateColor(code) {
     if (code === 'pending') return 'green';
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index aa74d1479..301967afb 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
 import LeftMenu from 'components/LeftMenu.vue';
+import { useStateStore } from 'stores/useStateStore';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
 
-const state = useState();
+const stateStore = useStateStore();
 const navigation = useNavigationStore();
 const { t } = useI18n();
 
@@ -15,7 +15,12 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
 </script>
 
 <template>
-    <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="800">
+    <q-drawer
+        v-model="stateStore.leftDrawer"
+        show-if-above
+        :width="256"
+        :breakpoint="1000"
+    >
         <q-scroll-area class="fit text-grey-8">
             <LeftMenu />
         </q-scroll-area>