diff --git a/src/components/NavMenu.vue b/src/components/NavMenu.vue
index 715a8e4d..bde201b7 100644
--- a/src/components/NavMenu.vue
+++ b/src/components/NavMenu.vue
@@ -370,7 +370,7 @@
 
     const handleFolderCycleNavigation = (item) => {
         if (!item?.entries?.length) {
-            return [];
+            return;
         }
         const entries = item.entries.filter((entry) => Boolean(entry?.routeName || entry?.path));
         if (!entries.length) {
@@ -593,13 +593,6 @@
         }
     };
 
-    function handleKeydown(e) {
-        if (e.ctrlKey && e.key === 'd') {
-            e.preventDefault();
-            directAccessPaste();
-        }
-    }
-
     const handleSupportLink = (id) => {
         supportMenuVisible.value = false;
         const target = links[id];
@@ -738,7 +731,6 @@
 
     onMounted(async () => {
         await loadNavMenuConfig();
-        window.addEventListener('keydown', handleKeydown);
 
         if (!sentryErrorReporting.value) return;
         try {
@@ -750,10 +742,6 @@
             console.error('Error setting up Sentry feedback:', error);
         }
     });
-
-    onUnmounted(() => {
-        window.removeEventListener('keydown', handleKeydown);
-    });
 </script>
 
 <style scoped>
diff --git a/src/stores/ui.js b/src/stores/ui.js
index 52dfd3ee..cf512155 100644
--- a/src/stores/ui.js
+++ b/src/stores/ui.js
@@ -3,16 +3,21 @@ import { defineStore } from 'pinia';
 import { useRouter } from 'vue-router';
 
 import { useNotificationStore } from './notification';
-import { watchState } from '../service/watchState';
+import { useSearchStore } from './search';
 
 export const useUiStore = defineStore('Ui', () => {
     const notificationStore = useNotificationStore();
     const router = useRouter();
+    const search = useSearchStore();
 
     document.addEventListener('keydown', function (e) {
         if (e.shiftKey) {
             shiftHeld.value = true;
         }
+        if (e.ctrlKey && e.key === 'd') {
+            e.preventDefault();
+            search.directAccessPaste();
+        }
     });
 
     document.addEventListener('keyup', function (e) {
@@ -24,15 +29,6 @@ export const useUiStore = defineStore('Ui', () => {
     const notifiedMenus = ref([]);
     const shiftHeld = ref(false);
     const trayIconNotify = ref(false);
-    watch(
-        () => watchState.isLoggedIn,
-        (isLoggedIn) => {
-            if (isLoggedIn) {
-                router.push({ name: 'feed' });
-            }
-        },
-        { flush: 'sync' }
-    );
 
     function notifyMenu(index) {
         const currentRouteName = router.currentRoute.value?.name;