From b78ecbec547ae79f84a0105f50c485f95573c9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Thu, 26 Feb 2026 12:56:31 +0100
Subject: [PATCH] nicolium: further improvements for multiselect keyboard
 navigation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 packages/pl-fe/src/components/ui/multiselect.tsx    | 13 +++++++++++++
 .../pl-fe/src/features/ui/components/hotkeys.tsx    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/pl-fe/src/components/ui/multiselect.tsx b/packages/pl-fe/src/components/ui/multiselect.tsx
index 13f34d034..3f4fae048 100644
--- a/packages/pl-fe/src/components/ui/multiselect.tsx
+++ b/packages/pl-fe/src/components/ui/multiselect.tsx
@@ -195,8 +195,21 @@ const Multiselect: React.FC<IMultiselect> = ({
           break;
         case 'Escape':
           setIsOpen(false);
+          searchBoxRef.current?.focus();
           break;
         default:
+          if (document.activeElement !== searchBoxRef.current) {
+            if (
+              e.key === 'Backspace' ||
+              e.key === 'ArrowLeft' ||
+              e.key === 'ArrowRight' ||
+              (e.key.length === 1 && !e.ctrlKey && !e.metaKey)
+            ) {
+              searchBoxRef.current?.focus();
+            }
+          } else if (!isOpen) {
+            setIsOpen(true);
+          }
       }
     },
     [inputValue, selectedValues, visibleOptions, isOpen, onSelectItem, onRemoveSelectedItem],
diff --git a/packages/pl-fe/src/features/ui/components/hotkeys.tsx b/packages/pl-fe/src/features/ui/components/hotkeys.tsx
index 0dbe1eb96..369f3ddb5 100644
--- a/packages/pl-fe/src/features/ui/components/hotkeys.tsx
+++ b/packages/pl-fe/src/features/ui/components/hotkeys.tsx
@@ -193,7 +193,7 @@ function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
         isKeyboardEvent(event) &&
         !event.defaultPrevented &&
         !['input', 'textarea', 'select', 'em-emoji-picker'].includes(tagName) &&
-        !(event.target as HTMLElement).closest('[contenteditable]') &&
+        !(event.target as HTMLElement).closest('[contenteditable], .multiselect-container') &&
         !(['a', 'button'].includes(tagName) && normalizeKey(event.key) === 'enter');
 
       if (shouldHandleEvent) {