1 files changed, 5 insertions, 6 deletions

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 2bc141f7..c5ed8d33 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
@@ -85,8 +85,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
 
     handleNewFileDirectorySet:{
          value:function(evt){
-             if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
-                 this.handleOkButtonAction(evt);
+             if(evt.keyCode === 13){
+                 if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt);
              }else if(evt.keyCode === 27){
                  this.handleCancelButtonAction(evt);
              }
@@ -101,10 +101,9 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
 
     handlePaste:{
         value:function(evt){
-            var self=this;
-            setTimeout(function(){
-                self.handleNewFileNameOnkeyup(evt);
-            }, 1);
+            evt.preventDefault();
+            evt.target.value = evt.clipboardData.getData("Text");
+            this.handleNewFileNameOnkeyup(evt);
         }
     },