diff --git a/components/canvas/canvas-with-tools.tsx b/components/canvas/canvas-with-tools.tsx
index 6562e6c..74f3b96 100644
--- a/components/canvas/canvas-with-tools.tsx
+++ b/components/canvas/canvas-with-tools.tsx
@@ -69,7 +69,7 @@ export function CanvasWithTools() {
   const { activeTool, settings } = useToolStore();
   const { executeCommand } = useHistoryStore();
   const { activeSelection, selectionType, isMarching } = useSelectionStore();
-  const { textObjects, editingTextId } = useTextStore();
+  const { textObjects, editingTextId, isOnCanvasEditorActive } = useTextStore();
   const [marchingOffset, setMarchingOffset] = useState(0);
 
   const [isPanning, setIsPanning] = useState(false);
@@ -227,8 +227,11 @@ export function CanvasWithTools() {
       return;
     }
 
-    // Text tool
+    // Text tool - only handle if editor is not already active
     if (activeTool === 'text') {
+      // If editor is active, let it handle its own events (selection, dragging, click-outside)
+      if (isOnCanvasEditorActive) return;
+
       const activeLayer = getActiveLayer();
       if (!activeLayer || !activeLayer.canvas || activeLayer.locked) return;