diff --git a/dashboard/src/views/volumes.html b/dashboard/src/views/volumes.html
index 4f4fda775..1965822d4 100644
--- a/dashboard/src/views/volumes.html
+++ b/dashboard/src/views/volumes.html
@@ -34,10 +34,14 @@
               <input type="text" class="form-control" ng-model="volumeAdd.hostPath" name="hostPath" ng-disabled="volumeAdd.busy" placeholder="/mnt/data" ng-required="volumeAdd.mountType === 'mountpoint'" autofocus>
             </div>
 
-            <div class="form-group" ng-show="volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs'">
+            <div class="form-group" ng-show="volumeAdd.mountType === 'ext4'">
               <label class="control-label">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>
-              <select class="form-control" ng-model="volumeAdd.disk" ng-options="item as item.label for item in blockDevices track by item.path"></select>
-              <input type="text" class="form-control" style="margin-top: 5px;" ng-show="volumeAdd.disk.path === 'custom'" ng-model="volumeAdd.customDiskPath" ng-disabled="volumeAdd.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="(volumeAdd.mountType === 'ext4' || volumeAdd.mountType === 'xfs') && volumeAdd.disk.path === 'custom'">
+              <select class="form-control" ng-model="volumeAdd.ext4Disk" ng-options="item as item.label for item in ext4BlockDevices track by item.path" ng-required="volumeAdd.mountType === 'ext4'"></select>
+            </div>
+
+            <div class="form-group" ng-show="volumeAdd.mountType === 'xfs'">
+              <label class="control-label">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>
+              <select class="form-control" ng-model="volumeAdd.xfsDisk" ng-options="item as item.label for item in xfsBlockDevices track by item.path" ng-required="volumeAdd.mountType === 'xfs'"></select>
             </div>
 
             <div class="form-group" ng-show="volumeAdd.mountType === 'cifs' || volumeAdd.mountType === 'nfs' || volumeAdd.mountType === 'sshfs'">
diff --git a/dashboard/src/views/volumes.js b/dashboard/src/views/volumes.js
index 5448bcde1..665b762ad 100644
--- a/dashboard/src/views/volumes.js
+++ b/dashboard/src/views/volumes.js
@@ -88,8 +88,8 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
         remoteDir: '',
         username: '',
         password: '',
-        diskPath: {}, // { path, type }
-        customDiskPath: '',
+        ext4Disk: null, // { path, type }
+        xfsDisk: null, // { path, type }
         user: '',
         seal: false,
         port: 22,
@@ -105,8 +105,8 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
             $scope.volumeAdd.remoteDir = '';
             $scope.volumeAdd.username = '';
             $scope.volumeAdd.password = '';
-            $scope.volumeAdd.disk = {};
-            $scope.volumeAdd.customDiskPath = '';
+            $scope.volumeAdd.ext4Disk = null;
+            $scope.volumeAdd.xfsDisk = null;
             $scope.volumeAdd.user = '';
             $scope.volumeAdd.seal = false;
             $scope.volumeAdd.port = 22;
@@ -119,7 +119,8 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
         show: function () {
             $scope.volumeAdd.reset();
 
-            $scope.blockDevices = [];
+            $scope.ext4BlockDevices = [];
+            $scope.xfsBlockDevices = [];
 
             Client.getBlockDevices(function (error, result) {
                 if (error) console.error('Failed to list blockdevices:', error);
@@ -130,13 +131,8 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
                 // amend label for UI
                 result.forEach(function (d) { d.label = d.path; });
 
-                // add custom fake option
-                result.push({ path: 'custom', label: 'Custom Path' });
-
-                $scope.blockDevices = result;
-                $scope.volumeAdd.disk = $scope.blockDevices[0];
-
-                console.log('0-0-0', $scope.volumeAdd.disk, $scope.blockDevices)
+                $scope.ext4BlockDevices = result.filter(function (d) { return d.type === 'ext4'; });
+                $scope.xfsBlockDevices = result.filter(function (d) { return d.type === 'xfs'; });
 
                 $('#volumeAddModal').modal('show');
             });
@@ -169,9 +165,13 @@ angular.module('Application').controller('VolumesController', ['$scope', '$locat
                     user: $scope.volumeAdd.user,
                     privateKey: $scope.volumeAdd.privateKey,
                 };
-            } else if ($scope.volumeAdd.mountType === 'ext4' || $scope.volumeAdd.mountType === 'xfs') {
+            } else if ($scope.volumeAdd.mountType === 'ext4') {
                 mountOptions = {
-                    diskPath: $scope.volumeAdd.disk.path === 'custom' ? $scope.volumeAdd.customDiskPath : $scope.volumeAdd.disk.path
+                    diskPath: $scope.volumeAdd.ext4Disk.path
+                };
+            } else if ($scope.volumeAdd.mountType === 'xfs') {
+                mountOptions = {
+                    diskPath: $scope.volumeAdd.xfsDisk.path
                 };
             } else if ($scope.volumeAdd.mountType === 'mountpoint' || $scope.volumeAdd.mountType === 'filesystem') {
                 mountOptions = {