diff --git a/src/views/system.html b/src/views/system.html
index f6dd45295..ae3f2f2f9 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -57,7 +57,12 @@
       <div class="card">
         <div class="row" ng-show="disks.busy">
           <div class="col-md-12 text-center">
-            <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
+            <h2 style="margin: 60px 0;"><i class="fa fa-circle-notch fa-spin"></i></h2>
+          </div>
+        </div>
+        <div class="row" ng-show="!disks.busy && !disks.ts">
+          <div class="col-md-12 text-center">
+            <button class="btn btn-primary" style="margin: 60px 0;" ng-click="disks.refresh()" ng-disabled="disks.busyRefresh"><i class="fas fa-sync-alt fa-spin" ng-show="disks.busyRefresh"></i> Analyze Disk</button>
           </div>
         </div>
         <div ng-hide="disks.busy" class="ng-hide">
diff --git a/src/views/system.js b/src/views/system.js
index e50c38a0d..19074db45 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -38,6 +38,11 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             Client.diskUsage(function (error, result) {
                 if (error) return console.error('Failed to refresh disk usage.', error);
 
+                if (!result.usage) {
+                    $scope.disks.busy = false;
+                    return;
+                }
+
                 $scope.disks.ts = result.usage.ts;
 
                 // [ { filesystem, type, size, used, available, capacity, mountpoint }]