1 files changed, 12 insertions, 3 deletions
diff --git a/js/ui/keys.js b/js/ui/keys.js
index 739871b..c8df3e8 100644
--- a/js/ui/keys.js
+++ b/js/ui/keys.js
@@ -9,15 +9,24 @@ var keys = (function(){
       if (e.altKey) {
         document.body.classList.add("dropper")
       }
+
+      switch (e.keyCode) {
+        case 27: // esc
+          if (!selection.hidden && current_canvas === canvas){
+            selection.hide()
+            selection.show()
+          } else if (focused){
+            focused.blur()
+          }
+          return
+      }
+
       if (window.focused && focused.raw_key) {
         focused.raw_key(e)
         return
       }
 
       switch (e.keyCode) {
-        case 27: // esc
-          if (focused) focused.blur()
-          break
         case 219: // [
           if (current_tool.name != "text") {
             e.preventDefault()