diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index 92b007b00c..d2651fb77d 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -108,7 +108,7 @@ define([
                 data: post_data,
                 success: function(data) {
                     var renamed_dirent_data = {
-                        'obj_name': options.newname,
+                        'obj_name': data.obj_name,
                         'last_modified': new Date().getTime()/1000,
                         'last_update': gettext("Just now")
                     };
diff --git a/static/scripts/app/views/dialogs/dirent-rename.js b/static/scripts/app/views/dialogs/dirent-rename.js
index e6c7d530ef..a94805db5c 100644
--- a/static/scripts/app/views/dialogs/dirent-rename.js
+++ b/static/scripts/app/views/dialogs/dirent-rename.js
@@ -24,6 +24,7 @@ define([
             var $input = this.$('[name="newname"]');
             var dot_index = this.dirent.get('obj_name').lastIndexOf('.');
             if (!this.dirent.get('is_dir') && dot_index != -1) {
+                $input[0].focus();
                 $input[0].setSelectionRange(0, dot_index);
             } else {
                 $input.select();
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index e5297d9224..75df7cd541 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -366,9 +366,12 @@ define([
             $op.hide();
             $name.hide();
 
+            this.$el.attr('draggable', false);
+
             var $input = $('[name="newname"]', form);
             var dot_index = dirent_name.lastIndexOf('.');
             if (!this.model.get('is_dir') && dot_index != -1) {
+                $input[0].focus();
                 $input[0].setSelectionRange(0, dot_index);
             } else {
                 $input.select();
@@ -383,6 +386,8 @@ define([
                     app.ui.currentHighlightedItem.rmHighlight();
                 }
 
+                _this.$el.attr('draggable', true);
+
                 if (_this.model.get('is_img')) {
                     var index = $('.img-name-link', _this.dirView.$dirent_list).index(_this.$('.img-name-link'));
                     _this.dirView.updateMagnificPopupOptions({
@@ -403,6 +408,8 @@ define([
                 $td.attr('colspan', 1).css({
                     'width': $name.width()
                 });
+
+                _this.$el.attr('draggable', true);
                 return false; // stop bubbling (to 'doc click to hide .hidden-op')
             };
             $('.cancel', form).click(cancelRename);