diff --git a/app/src/directives/context-menu.ts b/app/src/directives/context-menu.ts
index 893817b936..93f739e9ed 100644
--- a/app/src/directives/context-menu.ts
+++ b/app/src/directives/context-menu.ts
@@ -3,6 +3,8 @@ import { Directive, DirectiveBinding } from 'vue';
 function mounted(element: HTMLElement, binding: DirectiveBinding): void {
 	const contextMenu = binding.instance?.$refs[binding.value];
 
+	if (!contextMenu) return;
+
 	element.addEventListener('contextmenu', activateContextMenu(contextMenu));
 	document.documentElement.addEventListener('pointerdown', deactivateContextMenu(contextMenu));
 }
@@ -10,6 +12,8 @@ function mounted(element: HTMLElement, binding: DirectiveBinding): void {
 function unmounted(element: HTMLElement, binding: DirectiveBinding): void {
 	const contextMenu = binding.instance?.$refs[binding.value];
 
+	if (!contextMenu) return;
+
 	element.removeEventListener('contextmenu', activateContextMenu(contextMenu));
 	document.documentElement.removeEventListener('pointerdown', deactivateContextMenu(contextMenu));
 }
diff --git a/app/src/modules/content/components/navigation-item.vue b/app/src/modules/content/components/navigation-item.vue
index 5caf20d4ee..87344a1022 100644
--- a/app/src/modules/content/components/navigation-item.vue
+++ b/app/src/modules/content/components/navigation-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<v-list-group
 		v-if="isGroup && matchesSearch"
-		v-context-menu="'contextMenu'"
+		v-context-menu="hasContextMenu ? 'contextMenu' : null"
 		:to="to"
 		scope="content-navigation"
 		:value="collection.collection"
@@ -128,7 +128,7 @@ export default defineComponent({
 			}
 		});
 
-		const hasContextMenu = computed(() => isAdmin);
+		const hasContextMenu = computed(() => isAdmin && props.collection.type === 'table');
 
 		return {
 			childCollections,