diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js
index df5ad8a..b8992e4 100644
--- a/www/manager6/qemu/OSDefaults.js
+++ b/www/manager6/qemu/OSDefaults.js
@@ -52,6 +52,7 @@ Ext.define('PVE.qemu.OSDefaults', {
                     virtio: 1,
                 },
                 scsihw: 'virtio-scsi-single',
+                diskSize: 32,
             },
 
             aarch64: {
@@ -66,6 +67,7 @@ Ext.define('PVE.qemu.OSDefaults', {
                 },
                 scsihw: 'virtio-scsi-single',
                 bios: 'ovmf',
+                diskSize: 32,
             },
         };
 
@@ -114,6 +116,8 @@ Ext.define('PVE.qemu.OSDefaults', {
             parent: 'generic',
             machine: 'q35',
             bios: 'ovmf',
+            // Windows 11 requires at least 64 GB of storage
+            diskSize: 64,
         });
 
         me.getDefaults = function (ostype, arch = 'x86_64') {
diff --git a/www/manager6/qemu/OSPanel.js b/www/manager6/qemu/OSPanel.js
index 556ad4c..b653bd3 100644
--- a/www/manager6/qemu/OSPanel.js
+++ b/www/manager6/qemu/OSPanel.js
@@ -54,6 +54,7 @@ Ext.define('PVE.qemu.OSPanel', {
             me.setWidget('pveBusSelector', targetValues.busType);
             me.setWidget('pveNetworkCardSelector', targetValues.networkCard);
             me.setWidget('CPUModelSelector', targetValues.cputype);
+            me.setWidget('pveMultiHDPanel numberfield[name=disksize]', targetValues.diskSize);
             var scsihw = targetValues.scsihw || '__default__';
             this.getViewModel().set('current.scsihw', scsihw);
             this.getViewModel().set('current.ostype', ostype);