diff --git a/src/components/EditorCanvas.vue b/src/components/EditorCanvas.vue
index 029ba1268..b207eacea 100644
--- a/src/components/EditorCanvas.vue
+++ b/src/components/EditorCanvas.vue
@@ -69,7 +69,7 @@ function onTextKeyDown(e: KeyboardEvent) {
     <canvas ref="canvasRef" :style="{ cursor }" class="block size-full" />
     <textarea
       v-if="editingNode"
-      class="absolute z-10 resize-none overflow-hidden border-none bg-transparent p-0 font-normal text-black outline-none"
+      class="absolute z-10 resize-none overflow-hidden border border-accent bg-transparent p-0 font-normal text-black outline-none"
       :style="textOverlayStyle!"
       :value="editingNode.text"
       @input="onTextInput"
diff --git a/src/composables/use-canvas-input.ts b/src/composables/use-canvas-input.ts
index e765c2c4f..978783dc9 100644
--- a/src/composables/use-canvas-input.ts
+++ b/src/composables/use-canvas-input.ts
@@ -387,8 +387,9 @@ export function useCanvasInput(canvasRef: Ref<HTMLCanvasElement | null>, store:
     // Text tool: click to create text node
     if (tool === 'TEXT') {
       const nodeId = store.createShape('TEXT', cx, cy, 200, 24)
-      store.graph.updateNode(nodeId, { text: 'Text' })
+      store.graph.updateNode(nodeId, { text: '' })
       store.select([nodeId])
+      store.startTextEditing(nodeId)
       store.setTool('SELECT')
       store.requestRender()
       return