diff --git a/navigator/src/components/ContextMenu.vue b/navigator/src/components/ContextMenu.vue
index 03fd0d4..395713e 100644
--- a/navigator/src/components/ContextMenu.vue
+++ b/navigator/src/components/ContextMenu.vue
@@ -23,12 +23,13 @@ If not, see <https://www.gnu.org/licenses/>.
 		leave-active-class="origin-top-left transition ease-in duration-75"
 		leave-from-class="transform opacity-100 scale-100"
 		leave-to-class="transform opacity-0 scale-95"
+		@after-leave="reset"
 	>
 		<div
 			v-if="show"
 			class="fixed inset-0 bg-transparent"
-			@click="$emit('hide')"
-			@contextmenu.prevent="$emit('hide')"
+			@click="show = false"
+			@contextmenu.prevent="show = false"
 		>
 			<div
 				class="fixed z-20 max-w-sm flex flex-col items-stretch bg-default shadow-lg divide-y divide-default position-contextmenu">
@@ -214,7 +215,7 @@ If not, see <https://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import { inject } from 'vue'
+import { inject, ref, computed } from 'vue'
 import {
 	ArrowLeftIcon,
 	ArrowRightIcon,
@@ -235,16 +236,45 @@ import { pathHistoryInjectionKey } from '../keys';
 
 export default {
 	props: {
-		show: Boolean,
-		event: Object,
-		selection: Array,
-		currentDirEntry: Object,
+		currentPath: Object,
 	},
 	setup(props, { emit }) {
 		const pathHistory = inject(pathHistoryInjectionKey);
+		const show = ref();
+		const event = ref();
+		const selection = ref();
+		const currentDirEntry = computed(() => ({
+			...props.currentPath,
+			name: `Current directory (${props.currentPath.path.split('/').pop()})`
+		}));
+
+		/**
+		 * Open the context menu
+		 * 
+		 * @param {MouseEvent} event_ - event triggering the menu to be opened
+		 * @param {DirectoryEntryObj[]} selection_ - items selected at event trigger
+		 */
+		const open = (event_, selection_) => {
+			event.value = event_;
+			selection.value = [...selection_];
+			show.value = true;
+		}
+
+		const reset = () => {
+			event.value = null;
+			selection.value = [];
+		}
 
 		return {
+			// data
 			pathHistory,
+			show,
+			event,
+			selection,
+			currentDirEntry,
+			// methods
+			open,
+			reset,
 		}
 	},
 	components: {
diff --git a/navigator/src/views/Browser.vue b/navigator/src/views/Browser.vue
index 3edb4d0..9c5bbb0 100644
--- a/navigator/src/views/Browser.vue
+++ b/navigator/src/views/Browser.vue
@@ -190,12 +190,9 @@
 		@hide="nameEditor.close"
 	/>
 	<ContextMenu
-		:show="contextMenu.show"
-		:selection="contextMenu.selection"
-		:event="contextMenu.event"
-		:currentDirEntry="{ ...pathHistory.current(), name: `Current directory (${pathHistory.current().path.split('/').pop()})` }"
+		:currentPath="pathHistory.current() ?? { path: '/', host: 'localhost' }"
 		@browserAction="handleAction"
-		@hide="contextMenu.close"
+		ref="contextMenuRef"
 	/>
 	<ModalPrompt ref="modalPromptRef" />
 	<Teleport to="#footer-buttons">
@@ -290,10 +287,10 @@ export default {
 		const darkMode = inject('darkModeInjectionKey');
 		const settings = inject(settingsInjectionKey);
 		const notifications = inject(notificationsInjectionKey);
+		const pathHistory = inject(pathHistoryInjectionKey);
+
 		const route = useRoute();
 		const router = useRouter();
-		const pathHistory = inject(pathHistoryInjectionKey);
-		const directoryViewRef = ref();
 		const searchFilterStr = ref("");
 		const searchFilterRegExp = ref(/^/g);
 		const backHistoryDropdown = reactive({
@@ -404,25 +401,8 @@ export default {
 				}, 500);
 			},
 		});
-		const contextMenu = reactive({
-			show: false,
-			selection: [],
-			event: null,
-			resetTimeoutHandle: null,
-			open: (event) => {
-				clearTimeout(contextMenu.resetTimeoutHandle);
-				contextMenu.selection = getSelected();
-				contextMenu.event = event;
-				contextMenu.show = true;
-			},
-			close: () => {
-				contextMenu.show = false;
-				contextMenu.resetTimeoutHandle = setTimeout(() => {
-					contextMenu.resetTimeoutHandle = contextMenu.selection = [];
-					contextMenu.resetTimeoutHandle = contextMenu.event = null;
-				}, 500);
-			},
-		});
+		const directoryViewRef = ref();
+		const contextMenuRef = ref();
 		const modalPromptRef = ref();
 
 		const cd = ({ path, host }) => {
@@ -455,7 +435,6 @@ export default {
 				return `cockpit-navigator-dowload_${now.getFullYear()}-${now.getMonth()+1}-${now.getDay()}_${now.getHours()}-${now.getMinutes()}-${now.getSeconds()}.zip`;
 			}
 			let items = [].concat(selection); // forces to be array
-			console.log(items);
 			if (items.length > 1) {
 				const dirs = items.filter(item => item.type === 'd').map(item => item.path);
 				if (dirs.length) {
@@ -464,7 +443,6 @@ export default {
 					items = items.filter(item => !containedRegex.test(item.path));
 				}
 				const { common, relativePaths } = commonPath(items.map(item => item.path));
-				console.log(common, relativePaths);
 				streamProcDownload(['zip', '-rq', '-', ...relativePaths], getZipName(), { superuser: 'try', directory: common });
 			} else {
 				let { path, name, host, resolvedType } = items[0];
@@ -539,7 +517,6 @@ export default {
 				);
 			if (!result)
 				return; // cancelled
-			console.log(result);
 			try {
 				const parentPath = parentEntry.resolvedType === 'd' ? parentEntry.resolvedPath : parentEntry.path.split('/').slice(0, -1).join('/');
 				const path = `${parentPath}/${result.linkName}`
@@ -579,7 +556,8 @@ export default {
 					download(...args);
 					break;
 				case 'contextMenu':
-					contextMenu.open(...args);
+					const [event] = [...args];
+					contextMenuRef.value.open(event, getSelected());
 					break;
 				case 'back':
 					back();
@@ -636,11 +614,10 @@ export default {
 
 		return {
 			cockpit,
-			console,
+			// data
 			darkMode,
 			settings,
 			pathHistory,
-			directoryViewRef,
 			searchFilterStr,
 			searchFilterRegExp,
 			backHistoryDropdown,
@@ -649,8 +626,11 @@ export default {
 			confirm,
 			filePermissions,
 			nameEditor,
-			contextMenu,
+			// component refs
+			directoryViewRef,
+			contextMenuRef,
 			modalPromptRef,
+			// methods
 			cd,
 			back,
 			forward,