From 9cf252f5d57d3190251354b35102bbbe48f11d17 Mon Sep 17 00:00:00 2001
From: Trang Doan <doantranghp2000@gmail.com>
Date: Wed, 25 Feb 2026 12:53:28 -0500
Subject: [PATCH 1/3] wip

---
 apps/roam/src/components/ModifyNodeDialog.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/roam/src/components/ModifyNodeDialog.tsx b/apps/roam/src/components/ModifyNodeDialog.tsx
index c3d71c702..3137e338f 100644
--- a/apps/roam/src/components/ModifyNodeDialog.tsx
+++ b/apps/roam/src/components/ModifyNodeDialog.tsx
@@ -505,7 +505,7 @@ const ModifyNodeDialog = ({
         <div className={`${Classes.DIALOG_BODY} flex flex-col gap-4`}>
           {/* Node Type Selector */}
           <div className="flex w-full">
-            <Label>
+            <Label autoFocus={false}>
               Node Type
               <MenuItemSelect
                 items={discourseNodes.map((n) => n.type)}
@@ -521,6 +521,7 @@ const ModifyNodeDialog = ({
                   }
                 }}
                 disabled={mode === "edit"}
+                popoverProps={{ openOnTargetFocus: false }}
               />
             </Label>
           </div>
@@ -539,7 +540,7 @@ const ModifyNodeDialog = ({
               }
               mode={mode}
               isLocked={isContentLocked}
-              autoFocus
+              autoFocus={!isContentLocked}
             />
           </div>
 
@@ -565,11 +566,13 @@ const ModifyNodeDialog = ({
             className={`${Classes.DIALOG_FOOTER_ACTIONS} flex-row-reverse items-center`}
           >
             <Button
+              key={isContentLocked ? "confirm-locked" : "confirm-unlocked"}
               text="Confirm"
               intent={Intent.PRIMARY}
               onClick={() => void onSubmit()}
               disabled={loading || !content.text.trim()}
               className="flex-shrink-0"
+              autoFocus={isContentLocked}
             />
             <Button
               text="Cancel"

From 4dfbdcda02204e12477ea30cca1c0f29385dbfe0 Mon Sep 17 00:00:00 2001
From: Trang Doan <doantranghp2000@gmail.com>
Date: Thu, 26 Feb 2026 16:30:11 -0500
Subject: [PATCH 2/3] add keyup

---
 apps/roam/src/components/FuzzySelectInput.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/roam/src/components/FuzzySelectInput.tsx b/apps/roam/src/components/FuzzySelectInput.tsx
index e685811b8..da6651b52 100644
--- a/apps/roam/src/components/FuzzySelectInput.tsx
+++ b/apps/roam/src/components/FuzzySelectInput.tsx
@@ -93,6 +93,17 @@ const FuzzySelectInput = <T extends Result = Result>({
         e.preventDefault();
         e.stopPropagation();
         if (isOpen && filteredItems[activeIndex]) {
+           const keyUpHandler = (keyUpEvent: KeyboardEvent) => {
+             if (keyUpEvent.key === "Enter" || keyUpEvent.key === " ") {
+               keyUpEvent.preventDefault();
+               keyUpEvent.stopPropagation();
+               document.removeEventListener("keyup", keyUpHandler, true);
+             }
+           };
+           document.addEventListener("keyup", keyUpHandler, true);
+           setTimeout(() => {
+             document.removeEventListener("keyup", keyUpHandler, true);
+           }, 150);
           handleSelect(filteredItems[activeIndex]);
         }
       } else if (e.key === "Escape") {

From 3d79715f82e09936008c749a2395dd5e4734f160 Mon Sep 17 00:00:00 2001
From: Trang Doan <doantranghp2000@gmail.com>
Date: Thu, 26 Feb 2026 17:15:46 -0500
Subject: [PATCH 3/3] format

---
 apps/roam/src/components/FuzzySelectInput.tsx | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/roam/src/components/FuzzySelectInput.tsx b/apps/roam/src/components/FuzzySelectInput.tsx
index da6651b52..1dd76f77e 100644
--- a/apps/roam/src/components/FuzzySelectInput.tsx
+++ b/apps/roam/src/components/FuzzySelectInput.tsx
@@ -93,17 +93,17 @@ const FuzzySelectInput = <T extends Result = Result>({
         e.preventDefault();
         e.stopPropagation();
         if (isOpen && filteredItems[activeIndex]) {
-           const keyUpHandler = (keyUpEvent: KeyboardEvent) => {
-             if (keyUpEvent.key === "Enter" || keyUpEvent.key === " ") {
-               keyUpEvent.preventDefault();
-               keyUpEvent.stopPropagation();
-               document.removeEventListener("keyup", keyUpHandler, true);
-             }
-           };
-           document.addEventListener("keyup", keyUpHandler, true);
-           setTimeout(() => {
-             document.removeEventListener("keyup", keyUpHandler, true);
-           }, 150);
+          const keyUpHandler = (keyUpEvent: KeyboardEvent) => {
+            if (keyUpEvent.key === "Enter" || keyUpEvent.key === " ") {
+              keyUpEvent.preventDefault();
+              keyUpEvent.stopPropagation();
+              document.removeEventListener("keyup", keyUpHandler, true);
+            }
+          };
+          document.addEventListener("keyup", keyUpHandler, true);
+          setTimeout(() => {
+            document.removeEventListener("keyup", keyUpHandler, true);
+          }, 150);
           handleSelect(filteredItems[activeIndex]);
         }
       } else if (e.key === "Escape") {