2 files changed, 8 insertions, 0 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index d5b59ab8..ecee7c1d 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -313,6 +313,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         value:function(evt){
             if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
                 this.handleOkButtonAction(evt);
+            }else if(evt.keyCode === 27){
+                this.handleCancelButtonAction(evt);
             }
             else if(!!evt._event.newFileDirectory){
                 this.newFileDirectory = evt._event.newFileDirectory;
@@ -327,6 +329,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         value:function(evt){
             if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
                 this.handleOkButtonAction(evt);
+            }else if(evt.keyCode === 27){
+                this.handleCancelButtonAction(evt);
             }
             else if(!!evt._event.newFileName){
                 this.newFileName = evt._event.newFileName;
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index 1910f30d..dfaac1aa 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -71,6 +71,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
          value:function(evt){
              if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
                  this.handleOkButtonAction(evt);
+             }else if(evt.keyCode === 27){
+                 this.handleCancelButtonAction(evt);
              }
              else if(!!evt._event.newFileDirectory){
                  this.folderUri = evt._event.newFileDirectory;
@@ -93,6 +95,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
                   if(!this.okButton.hasAttribute("disabled")){
                       this.handleOkButtonAction(evt);
                   }
+              }else if(evt.keyCode === 27){
+                  this.handleCancelButtonAction(evt);
               }
           }
     },