diff --git a/tldraw/packages/core/src/lib/tools/TLSelectTool/states/EditingShapeState.ts b/tldraw/packages/core/src/lib/tools/TLSelectTool/states/EditingShapeState.ts
index 31e2f6e1dc..0bd02a5d97 100644
--- a/tldraw/packages/core/src/lib/tools/TLSelectTool/states/EditingShapeState.ts
+++ b/tldraw/packages/core/src/lib/tools/TLSelectTool/states/EditingShapeState.ts
@@ -51,6 +51,9 @@ export class EditingShapeState<
           e.stopPropagation()
           this.app.setSelectedShapes([this.editingShape])
           this.tool.transition('idle')
+
+          // Blur all inputs when exit idle
+          document.querySelectorAll<HTMLElement>('input,textarea').forEach(el => el.blur())
         })
         break
       }