diff --git a/src/helper/tools/text-tool.js b/src/helper/tools/text-tool.js
index 27f4f6f6..d3940617 100644
--- a/src/helper/tools/text-tool.js
+++ b/src/helper/tools/text-tool.js
@@ -102,6 +102,11 @@ class TextTool extends paper.Tool {
     // Allow other tools to cancel text edit mode
     onTextEditCancelled () {
         this.endTextEdit();
+        if (this.textBox) {
+            this.mode = TextTool.SELECT_MODE;
+            this.textBox.selected = true;
+            this.setSelectedItems();
+        }
     }
     /**
      * Called when the view matrix changes