diff --git a/js/menus/otherUI/Console.js b/js/menus/otherUI/Console.js
index adeba7e169a97e0a8cf86a1d98f108ba87683eb8..7dbeea40f780f808d937d725fa72303807e668b8 100644
--- a/js/menus/otherUI/Console.js
+++ b/js/menus/otherUI/Console.js
@@ -67,11 +67,13 @@ define(['jquery', 'underscore', 'backbone', 'appState'], function($, _, Backbone
         },
 
         _onKeyUp: function(e){
+
             var $input = $("#consoleInput");
             if ($input.is(":focus")){
+                if (e.keyCode == 27) $input.blur();
 //                if (e.keyCode == 38) $output.val(this.model.getPrevHistElem());
 //                else if (e.keyCode == 40) $output.val(this.model.getNewerHistElem());
-                if (e.keyCode == 13) this._enterCommand($input);
+                else if (e.keyCode == 13) this._enterCommand($input);
             }
         },
 
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 7eed61b9c1505a2eb1f3c6694b4d05a005487a31..c9b3b9bb5729397f7f8e55ea55767ad4d0d8b57d 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -192,10 +192,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'],
         _handleKeyStroke: function(e){//receives keyup and keydown
 
 
-            if ($("input").is(':focus')) {
-                if (e.keyCode == 27) $(':focus').blur();
-                return;
-            }//we are typing in an input
+            if ($("input").is(':focus')) return;//we are typing in an input
             if ($("textarea").is(':focus')) return;//we are typing in an input
 
             var state = e.data.state;