diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 06567332b7df7a67d64ca5115edf0abf8d5ef2bb..38c74d242bc242daa357e1f49409476e925ccb63 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -480,7 +480,9 @@ a.action > img {
     display: inline-block;
     vertical-align: middle;
 }
-
+.selectedActions.hidden {
+    display: none;
+}
 .selectedActions a {
 	display: inline;
 	line-height: 50px;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cddedecda78bc46788826e1d5f77c08a7b802900..08c2844a294c6b6973bd612bf186be59fa30d954 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -817,13 +817,13 @@
 				return false;
 			}
 
-			self.fileMultiSelectMenu.toggleLoading('copyMove', true);
 			var disableLoadingState = function(){
 				self.fileMultiSelectMenu.toggleLoading('copyMove', false);
 			};
 
 			var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY;
 			OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) {
+				self.fileMultiSelectMenu.toggleLoading('copyMove', true);
 				if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
 					self.copy(files, targetPath, disableLoadingState);
 				}