diff --git a/packages/core/src/components/NodesSelection/NodesSelection.vue b/packages/core/src/components/NodesSelection/NodesSelection.vue
index cff4f287..87d89c07 100644
--- a/packages/core/src/components/NodesSelection/NodesSelection.vue
+++ b/packages/core/src/components/NodesSelection/NodesSelection.vue
@@ -18,8 +18,8 @@ const dragging = useDrag({
   },
 })
 
-watch($$(disableKeyboardA11y), (a11yDisabled) => {
-  if (!a11yDisabled) {
+onMounted(() => {
+  if (!disableKeyboardA11y) {
     el.value?.focus({ preventScroll: true })
   }
 })
@@ -33,9 +33,13 @@ const innerStyle = computed(() => ({
   left: `${selectedNodesBBox.x}px`,
 }))
 
-const onContextMenu = (event: MouseEvent) => emits.selectionContextMenu({ event, nodes: getSelectedNodes })
+function onContextMenu(event: MouseEvent) {
+  emits.selectionContextMenu({ event, nodes: getSelectedNodes })
+}
+
+function onKeyDown(event: KeyboardEvent) {
+  if (disableKeyboardA11y) return
 
-const onKeyDown = (event: KeyboardEvent) => {
   if (arrowKeyDiffs[event.key]) {
     updatePositions(
       {
@@ -68,7 +72,7 @@ export default {
       :style="innerStyle"
       :tabIndex="disableKeyboardA11y ? undefined : -1"
       @contextmenu="onContextMenu"
-      @keydown="disableKeyboardA11y ? undefined : onKeyDown"
+      @keydown="onKeyDown"
     />
   </div>
 </template>
diff --git a/packages/core/src/container/Pane/Pane.vue b/packages/core/src/container/Pane/Pane.vue
index 6b998b01..3b110965 100644
--- a/packages/core/src/container/Pane/Pane.vue
+++ b/packages/core/src/container/Pane/Pane.vue
@@ -155,7 +155,6 @@ function onMouseUp(event: MouseEvent) {
 }
 
 function onMouseLeave(event: MouseEvent) {
-  console.log('mouseleave')
   if (!hasActiveSelection.value) return emits.paneMouseLeave(event)
 
   if (userSelectionActive.value) {