diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index bb648a7a6f..0257fa590c 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -162,6 +162,7 @@ define([
 
                 this.direntDetailsView.hide();
                 this.fileCommentsView.hide();
+                this.fileUploadView.closePopup();
             },
 
             /***** private functions *****/
diff --git a/static/scripts/app/views/fileupload.js b/static/scripts/app/views/fileupload.js
index 74b74988ef..c3046c0f22 100644
--- a/static/scripts/app/views/fileupload.js
+++ b/static/scripts/app/views/fileupload.js
@@ -99,10 +99,15 @@ define([
                 if (dirents.user_perm && dirents.user_perm != 'rw') {
                     return false;
                 }
+
                 popup.removeClass('hide');
                 cancel_all_btn.removeClass('hide');
                 close_icon.addClass('hide');
 
+                // in case the popup was folded.
+                popup.height(parseInt(_this.popup_height));
+                $('.fileupload-buttonbar, table', popup).removeClass('hide');
+
                 var path = dirents.path;
                 popup.fileupload('option', {
                     'formData': {
diff --git a/static/scripts/sysadmin-app/views/dir.js b/static/scripts/sysadmin-app/views/dir.js
index 79f9e6beac..1d1a6f0d12 100644
--- a/static/scripts/sysadmin-app/views/dir.js
+++ b/static/scripts/sysadmin-app/views/dir.js
@@ -113,6 +113,8 @@ define([
         hide: function() {
             this.$el.detach();
             this.attached = false;
+
+            this.fileUploadView.closePopup();
         },
 
         show: function(repo_id, path) {