diff --git a/www/manager6/qemu/HDEfi.js b/www/manager6/qemu/HDEfi.js
index 7cee8261..6a8aaa4a 100644
--- a/www/manager6/qemu/HDEfi.js
+++ b/www/manager6/qemu/HDEfi.js
@@ -11,6 +11,10 @@ Ext.define('PVE.qemu.EFIDiskInputPanel', {
     onGetValues: function(values) {
 	var me = this;
 
+	if (me.disabled) {
+	    return {};
+	}
+
 	var confid = 'efidisk0';
 
 	if (values.hdimage) {
@@ -32,17 +36,24 @@ Ext.define('PVE.qemu.EFIDiskInputPanel', {
 	me.down('#hdimage').setStorage(undefined, nodename);
     },
 
+    setDisabled: function(disabled) {
+	let me = this;
+	me.down('pveDiskStorageSelector').setDisabled(disabled);
+	me.callParent(arguments);
+    },
+
     initComponent: function() {
 	var me = this;
 
 	me.drive = {};
 
-	me.items= [
+	me.items = [
 	    {
 		xtype: 'pveDiskStorageSelector',
 		name: 'efidisk0',
 		storageContent: 'images',
 		nodename: me.nodename,
+		disabled: me.disabled,
 		hideSize: true,
 	    },
 	    {
diff --git a/www/manager6/qemu/HDTPM.js b/www/manager6/qemu/HDTPM.js
index 7fa5a424..45acc7d0 100644
--- a/www/manager6/qemu/HDTPM.js
+++ b/www/manager6/qemu/HDTPM.js
@@ -8,6 +8,10 @@ Ext.define('PVE.qemu.TPMDiskInputPanel', {
     onGetValues: function(values) {
 	var me = this;
 
+	if (me.disabled) {
+	    return {};
+	}
+
 	var confid = 'tpmstate0';
 
 	if (values.hdimage) {
@@ -29,6 +33,13 @@ Ext.define('PVE.qemu.TPMDiskInputPanel', {
 	me.down('#hdimage').setStorage(undefined, nodename);
     },
 
+    setDisabled: function(disabled) {
+	let me = this;
+	me.down('pveDiskStorageSelector').setDisabled(disabled);
+	me.down('proxmoxKVComboBox[name=version]').setDisabled(disabled);
+	me.callParent(arguments);
+    },
+
     initComponent: function() {
 	var me = this;
 
@@ -40,6 +51,7 @@ Ext.define('PVE.qemu.TPMDiskInputPanel', {
 		name: me.disktype + '0',
 		storageContent: 'images',
 		nodename: me.nodename,
+		disabled: me.disabled,
 		hideSize: true,
 		hideFormat: true,
 	    },
@@ -47,8 +59,9 @@ Ext.define('PVE.qemu.TPMDiskInputPanel', {
 		xtype: 'proxmoxKVComboBox',
 		name: 'version',
 		value: 'v2.0',
-		deleteEmpty: false,
 		fieldLabel: gettext('Version'),
+		deleteEmpty: false,
+		disabled: me.disabled,
 		comboItems: [
 		    ['v1.2', 'v1.2'],
 		    ['v2.0', 'v2.0'],