diff --git a/src/theme.scss b/src/theme.scss
index 8219b7993..c9fe7dade 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1374,6 +1374,12 @@ footer {
     overflow: auto;
 }
 
+.disks-last-updated {
+    font-size: 12px;
+    font-weight: bold;
+    align-self: center;
+}
+
 // ----------------------------
 // Error and status page classes
 // ----------------------------
diff --git a/src/views/system.html b/src/views/system.html
index 5b2082a9f..f6dd45295 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -48,8 +48,9 @@
     <div class="col-md-6">
       <h3 class="graphs-toolbar">
         {{ 'system.diskUsage.title' | tr }}
+        <span class="small disks-last-updated" ng-show="!disks.busy && disks.ts">Last updated: {{ disks.ts | prettyDate }}</span>
         <div class="graphs-toolbar-actions">
-          <button class="btn btn-sm btn-default" style="margin-right: 5px;" ng-click="disks.refresh()" ng-disabled="disks.busy"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': disks.busy }"></i></button>
+          <button class="btn btn-sm btn-default" style="margin-right: 5px;" ng-click="disks.refresh()" ng-disabled="disks.busy || disks.busyRefresh"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': disks.busyRefresh }"></i></button>
         </div>
       </h3>
 
@@ -63,7 +64,6 @@
           <div class="row" ng-repeat="disk in disks.disks" style="margin-bottom: 20px;">
             <div class="col-md-12">
               <h3>
-                <!-- <span>{{ disk.filesystem }}</span>  <span>({{ disk.mountpoint }})</span> -->
                 <span ng-bind-html="'system.diskUsage.mountedAt' | tr:{ filesystem: disk.filesystem, mountpoint: disk.mountpoint }"></span>
                 <span class="pull-right small" ng-show="disk.available && disk.size" ng-bind-html="'system.diskUsage.usedInfo' | tr:{ used: ((disk.size - disk.available) | prettyDiskSize), size: (disk.size | prettyDiskSize) }"></span>
                 <span class="pull-right small" ng-hide="disk.available && disk.size">{{ 'system.diskUsage.notAvailableYet' | tr }}</span>
diff --git a/src/views/system.js b/src/views/system.js
index 522b386e8..f3794b09b 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -30,16 +30,18 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
 
     $scope.disks = {
         busy: true,
+        busyRefresh: false,
+        ts: 0,
         disks: [],
 
-        refresh: function () {
-            $scope.disks.busy = true;
-
-            Client.refreshDiskUsage(function (error, result) {
+        show: function () {
+            Client.diskUsage(function (error, result) {
                 if (error) return console.error('Failed to refresh disk usage.', error);
 
+                $scope.disks.ts = result.usage.ts;
+
                 // [ { filesystem, type, size, used, available, capacity, mountpoint }]
-                $scope.disks.disks = Object.keys(result).map(function (k) { return result[k]; });
+                $scope.disks.disks = Object.keys(result.usage.disks).map(function (k) { return result.usage.disks[k]; });
 
                 $scope.disks.disks.forEach(function (disk) {
                     var usageOther = disk.occupied;
@@ -77,6 +79,18 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
 
                 $scope.disks.busy = false;
             });
+        },
+
+        refresh: function () {
+            $scope.disks.busyRefresh = true;
+
+            Client.refreshDiskUsage(function (error) {
+                $scope.disks.busyRefresh = false;
+
+                if (error) return console.error('Failed to refresh disk usage.', error);
+
+                $scope.disks.show();
+            });
         }
     };
 
@@ -224,7 +238,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
                 volumes.forEach(function (v) { $scope.volumesById[v.id] = v; });
 
                 $scope.graphs.refresh();
-                $scope.disks.refresh();
+                $scope.disks.show();
             });
         });
     });