diff --git a/src/filemanager.html b/src/filemanager.html
index d056733b7..1728f6522 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -200,6 +200,31 @@
     </div>
   </div>
 
+  <!-- Modal extract -->
+  <div class="modal fade" id="extractModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Extracting {{ extractStatus.fileName }}</h4>
+        </div>
+        <div class="modal-body">
+          <div ng-show="extractStatus.error">
+            <p class="text-danger">{{ extractStatus.error }}</p>
+          </div>
+          <div class="progress progress-striped active" ng-hide="extractStatus.error">
+            <div class="progress-bar" role="progressbar" style="width: 100%">
+            </div>
+          </div>
+          <p class="no-wrap" ng-hide="extractStatus.error">{{ extractStatus.fileName }}</p>
+        </div>
+        <div class="modal-footer" style="text-align: left;">
+          <small ng-hide="extractStatus.error">Do not refresh the page until extract has finished.</small>
+          <button class="btn btn-primary pull-right" ng-show="extractStatus.error" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- Modal editor close -->
   <div class="modal fade" id="textEditorCloseModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index a0255dfb9..c25ee5dd2 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -130,13 +130,39 @@ app.controller('FileManagerController', ['$scope', '$timeout', 'Client', functio
         return '/' + filePath;
     }
 
+    $scope.extractStatus = {
+        error: null,
+        busy: false,
+        fileName: ''
+    };
+
     function extract(entry) {
         var filePath = sanitize($scope.cwd + '/' + entry.fileName);
 
         if (entry.isDirectory) return;
 
+        // prevent it from getting closed
+        $('#extractModal').modal({
+            backdrop: 'static',
+            keyboard: false
+        });
+
+        $scope.extractStatus.fileName = entry.fileName;
+        $scope.extractStatus.error = null;
+        $scope.extractStatus.busy = true;
+
         Client.filesExtract($scope.appId, filePath, function (error) {
-            if (error) return Client.error(error);
+            $scope.extractStatus.busy = false;
+
+            if (error) {
+                console.error(error);
+                $scope.extractStatus.error = 'Failed to extract: ' + error.message;
+                return;
+            }
+
+            $('#extractModal').modal('hide');
+
+            $scope.refresh();
         });
     }