diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 6da4c178..af03958c 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -963,6 +963,29 @@ Ext.define('PVE.Utils', { utilities: {
 		}
 	    }
 	}
+    },
+
+    mp_counts: { mps: 10, unused: 10 },
+
+    forEachMP: function(func, includeUnused) {
+	var i, cont;
+	for (i = 0; i < PVE.Utils.mp_counts.mps; i++) {
+	    cont = func('mp', i);
+	    if (!cont && cont !== undefined) {
+		return;
+	    }
+	}
+
+	if (!includeUnused) {
+	    return;
+	}
+
+	for (i = 0; i < PVE.Utils.mp_counts.unused; i++) {
+	    cont = func('unused', i);
+	    if (!cont && cont !== undefined) {
+		return;
+	    }
+	}
     }
 },
 
diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index d2835a27..c4ae2db8 100644
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -90,25 +90,21 @@ Ext.define('PVE.lxc.RessourceView', {
 	    }
 	};
 
-	for (i = 0; i < 10; i++) {
-	    confid = "mp" + i;
+	PVE.Utils.forEachMP(function(bus, i) {
+	    confid = bus + i;
+	    var  header;
+	    if (bus === 'mp') {
+		header = gettext('Mount Point') + ' (' + confid + ')';
+	    } else {
+		header = gettext('Unused Disk') + ' ' + i;
+	    }
 	    rows[confid] = {
 		group: 1,
 		tdCls: 'pve-itype-icon-storage',
 		editor: mpeditor,
-		header: gettext('Mount Point') + ' (' + confid + ')'
+		header: header
 	    };
-	}
-
-	for (i = 0; i < 8; i++) {
-	    confid = "unused" + i;
-	    rows[confid] = {
-		group: 1,
-		tdCls: 'pve-itype-icon-storage',
-		editor: mpeditor,
-		header: gettext('Unused Disk') + ' ' + i
-	    };
-	}
+	}, true);
 
 	var baseurl = 'nodes/' + nodename + '/lxc/' + vmid + '/config';