diff --git a/src/main/frontend/app/components/flow/add-subcomponent-modal.tsx b/src/main/frontend/app/components/flow/add-subcomponent-modal.tsx
index 72f430c9..5327a494 100644
--- a/src/main/frontend/app/components/flow/add-subcomponent-modal.tsx
+++ b/src/main/frontend/app/components/flow/add-subcomponent-modal.tsx
@@ -60,8 +60,14 @@ export default function AddSubcomponentModal({ onClose, possibleChildren, onAddC
   useSubmitOnEnter(handleAddChild)
 
   return createPortal(
-    <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/40" onClick={handleClose}>
-      <div className="bg-background border-border relative flex h-1/2 w-1/3 min-w-[400px] flex-col rounded-lg border p-6 shadow-lg">
+    <div
+      className="fixed inset-0 z-60 flex items-center justify-center bg-black/40"
+      onClick={(mouseEvent) => {
+        mouseEvent.stopPropagation()
+        handleClose(mouseEvent)
+      }}
+    >
+      <div className="bg-background border-border relative flex h-1/2 w-1/3 min-w-100 flex-col rounded-lg border p-6 shadow-lg">
         {/* Close button */}
         <Button
           onClick={onClose}
diff --git a/src/main/frontend/app/routes/studio/canvas/flow.tsx b/src/main/frontend/app/routes/studio/canvas/flow.tsx
index 642c8f49..40125f1e 100644
--- a/src/main/frontend/app/routes/studio/canvas/flow.tsx
+++ b/src/main/frontend/app/routes/studio/canvas/flow.tsx
@@ -1779,6 +1779,8 @@ function FlowCanvas({ onOpenInEditor }: { onOpenInEditor: () => void }) {
           }}
           deleteKeyCode={null}
           minZoom={0.2}
+          nodeDragThreshold={4}
+          nodeClickDistance={4}
         >
           <Controls position="top-left">
             {hiddenForwardNodeIds.size > 0 && (