diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index c1f3b86834..184dc70c3b 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -95,10 +95,18 @@ define([
                     var target =  e.target || event.srcElement;
                     var $form = $('#rename-form');
                     if ($form.length && !$form.find('*').is(target)) {
+                        var $tr = $form.closest('tr'); // get $tr before $form removed in `.cancel click()`
                         $('.cancel', $form).click();
+                        if (!$tr.find('*').is(target)) {
+                            $tr.removeClass('hl').find('.repo-file-op').addClass('vh');
+                            $('.repo-file-list tr:gt(0)').each(function() {
+                                if ($(this).find('*').is(target)) {
+                                    $(this).addClass('hl').find('.repo-file-op').removeClass('vh');
+                                }
+                            });
+                        }
                     }
                 });
-
             },
 
             showDir: function(category, repo_id, path) {
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index fdc2bee541..503ff5faf2 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -222,6 +222,8 @@ define([
             $op.hide();
             $name.hide();
 
+            this.$('.hidden-op').addClass('hide');
+
             var cancelRename = function() {
                 form.remove();
                 $op.show();
@@ -229,8 +231,7 @@ define([
                 $td.attr('colspan', 1).css({
                     'width': $name.width()
                 });
-
-                _this.$el.removeClass('hl').find('.repo-file-op').addClass('vh');
+                return false; // stop bubbling (to 'doc click to hide .hidden-op')
             };
             $('.cancel', form).click(cancelRename);