diff --git a/packages/frontend-2/lib/viewer/composables/contextMenu.ts b/packages/frontend-2/lib/viewer/composables/contextMenu.ts
index 71d204027..8a1132bc2 100644
--- a/packages/frontend-2/lib/viewer/composables/contextMenu.ts
+++ b/packages/frontend-2/lib/viewer/composables/contextMenu.ts
@@ -175,20 +175,18 @@ export function useViewerContextMenu(params: {
 
   // Close context menu when selection changes
   watch(
-    () => filters.selectedObjects.value,
-    (newSelection, oldSelection) => {
-      if (contextMenuState.value.isVisible && newSelection !== oldSelection) {
+    () => filters.selectedObjectIds.value,
+    (newSelectionIds) => {
+      if (contextMenuState.value.isVisible) {
         const currentMenuObjectId = contextMenuState.value.selectedObjectId
-        const isCurrentObjectStillSelected = newSelection.some(
-          (obj) => obj.id === currentMenuObjectId
+        const isCurrentObjectStillSelected = newSelectionIds.has(
+          currentMenuObjectId || ''
         )
-
         if (!isCurrentObjectStillSelected) {
           closeContextMenu()
         }
       }
-    },
-    { deep: true }
+    }
   )
 
   return {