diff --git a/engine/src/tools/Text.js b/engine/src/tools/Text.js
index 8a09a0720..4e9a2d8d4 100644
--- a/engine/src/tools/Text.js
+++ b/engine/src/tools/Text.js
@@ -76,11 +76,18 @@ Wick.Tools.Text = class extends Wick.Tool {
             return;
         }
 
+        let oldTargetOnClick = e.event.target.onclick;
+        const targetOnClick = targetEvent => {
+            oldTargetOnClick && oldTargetOnClick(targetEvent);
+            e.event.target.onclick = oldTargetOnClick;
+            this.editingText.focus();
+        }
         if (this.editingText) {
             this.finishEditingText();
         } else if(this.hoveredOverText) {
             this.editingText = this.hoveredOverText;
             e.item.edit(this.project.view.paper);
+            e.event.target.onclick = targetOnClick;
         } else {
             var text = new this.paper.PointText(e.point);
             text.justification = 'left';
@@ -99,6 +106,7 @@ Wick.Tools.Text = class extends Wick.Tool {
 
             this.editingText = wickText.view.item;
             this.editingText.edit(this.project.view.paper);
+            e.event.target.onclick = targetOnClick;
 
             //this.fireEvent('canvasModified');
         }
diff --git a/engine/src/view/paper-ext/TextItem.edit.js b/engine/src/view/paper-ext/TextItem.edit.js
index ca4129259..9e5f66262 100644
--- a/engine/src/view/paper-ext/TextItem.edit.js
+++ b/engine/src/view/paper-ext/TextItem.edit.js
@@ -85,6 +85,9 @@
                 self.attachTextArea(paper);
             }
         },
+        focus: function () {
+            editElem[0].focus();
+        },
         finishEditing: function() {
             editElem.remove();
         },