diff --git a/src/translation/en.json b/src/translation/en.json
index b20826d02..7d52d9d8b 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -942,7 +942,8 @@
             "diskContent": "This {{ type }} disk contains",
             "notAvailableYet": "Not available yet",
             "usedInfo": "{{ used }} used of {{ size }}",
-            "uninstalledApp": "Uninstalled app"
+            "uninstalledApp": "Uninstalled app",
+            "volumeContent": "This disk is the volume {{ name }} and contains"
         },
         "systemMemory": {
             "title": "System Memory",
diff --git a/src/views/system.html b/src/views/system.html
index 9091ef3b9..b272efd0e 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -79,7 +79,8 @@
                 <div class="text-center text-muted">{{ disk.available | prettyDiskSize }}</div>
               </div>
               <br/>
-              <p>{{ 'system.diskUsage.diskContent' | tr:{ filesystem: disk.filesystem, mountpoint: disk.mountpoint } }}:</p>
+              <p ng-hide="disk.volume">{{ 'system.diskUsage.diskContent' | tr }}:</p>
+              <p ng-show="disk.volume">{{ 'system.diskUsage.volumeContent' | tr:{ name: disk.volume.name } }}:</p>
               <div ng-repeat="content in disk.contents" class="disk-content">
                 <span class="color-indicator" style="background-color: {{ content.color }};">&nbsp;</span>
                 <span ng-show="content.type === 'standard'">{{ content.label || content.id }}</span>
diff --git a/src/views/system.js b/src/views/system.js
index bfba98994..2e66d5973 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -80,7 +80,8 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
 
                     resetColors(disk.contents.length);
 
-                    // filter content if content entry is actually the volume mounted that disk
+                    // if this disk is a volume amend it and remove it from contents
+                    disk.contents.forEach(function (content) { if (content.path === disk.mountpoint) disk.volume = $scope.volumesById[content.id]; });
                     disk.contents = disk.contents.filter(function (content) { return content.path !== disk.mountpoint; });
 
                     disk.contents.forEach(function (content) {