diff --git a/src/filemanager.html b/src/filemanager.html
index b65d9fe06..d056733b7 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -184,13 +184,17 @@
           <h4 class="modal-title">Uploading files ({{ uploadStatus.countDone }}/{{ uploadStatus.count }})</h4>
         </div>
         <div class="modal-body">
-          <div class="progress progress-striped active">
+          <div ng-show="uploadStatus.error">
+            <p class="text-danger">{{ uploadStatus.error }}</p>
+          </div>
+          <div class="progress progress-striped active" ng-hide="uploadStatus.error">
             <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ uploadStatus.percentDone || 0 }}%"></div>
           </div>
-          <p class="no-wrap">{{ uploadStatus.fileName }}</p>
+          <p class="no-wrap" ng-hide="uploadStatus.error">{{ uploadStatus.fileName }}</p>
         </div>
         <div class="modal-footer" style="text-align: left;">
-          <small>Do not refresh the page until upload has finished.</small>
+          <small ng-hide="uploadStatus.error">Do not refresh the page until upload has finished.</small>
+          <button class="btn btn-primary pull-right" ng-show="uploadStatus.error" data-dismiss="modal">Close</button>
         </div>
       </div>
     </div>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index bc25f7c3b..186f288a1 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -275,6 +275,7 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
     };
 
     $scope.uploadStatus = {
+        error: null,
         busy: false,
         fileName: '',
         count: 0,
@@ -295,6 +296,7 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
             keyboard: false
         });
 
+        $scope.uploadStatus.error = null;
         $scope.uploadStatus.busy = true;
         $scope.uploadStatus.count = files.length;
         $scope.uploadStatus.countDone = 0;
@@ -323,11 +325,16 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
                 callback();
             });
         }, function (error) {
-            if (error) console.error(error);
+            $scope.uploadStatus.busy = false;
+
+            if (error) {
+                console.error(error);
+                $scope.uploadStatus.error = 'Failed to upload one or more files. Please try again.';
+                return;
+            }
 
             $('#uploadModal').modal('hide');
 
-            $scope.uploadStatus.busy = false;
             $scope.uploadStatus.fileName = '';
             $scope.uploadStatus.count = 0;
             $scope.uploadStatus.size = 0;