diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 11e71beb6..ea21c5dc4 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -91,6 +91,7 @@ JSSRC= 				                 	\
 	window/SafeDestroy.js				\
 	window/BackupConfig.js				\
 	window/Settings.js				\
+	window/StartupEdit.js				\
 	panel/NotesView.js				\
 	grid/SelectFeature.js				\
 	grid/ObjectGrid.js				\
@@ -147,7 +148,6 @@ JSSRC= 				                 	\
 	qemu/DisplayEdit.js				\
 	qemu/KeyboardEdit.js				\
 	qemu/HardwareView.js				\
-	qemu/StartupEdit.js				\
 	qemu/ScsiHwEdit.js				\
 	qemu/QemuBiosEdit.js				\
 	qemu/Options.js					\
diff --git a/www/manager6/qemu/Options.js b/www/manager6/qemu/Options.js
index 7c6721df3..cc9512abe 100644
--- a/www/manager6/qemu/Options.js
+++ b/www/manager6/qemu/Options.js
@@ -73,7 +73,10 @@ Ext.define('PVE.qemu.Options', {
 		defaultValue: '',
 		renderer: PVE.Utils.render_kvm_startup,
 		editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? 
-		    'PVE.qemu.StartupEdit' : undefined
+		    {
+			xtype: 'pveWindowStartupEdit',
+			onlineHelp: 'qm_startup_and_shutdown'
+		    } : undefined
 	    },
 	    ostype: {
 		header: gettext('OS Type'),
diff --git a/www/manager6/qemu/StartupEdit.js b/www/manager6/window/StartupEdit.js
similarity index 82%
rename from www/manager6/qemu/StartupEdit.js
rename to www/manager6/window/StartupEdit.js
index 3c832c5c8..7874794cc 100644
--- a/www/manager6/qemu/StartupEdit.js
+++ b/www/manager6/window/StartupEdit.js
@@ -1,4 +1,4 @@
-Ext.define('PVE.qemu.StartupInputPanel', {
+Ext.define('PVE.panel.StartupInputPanel', {
     extend: 'PVE.panel.InputPanel',
     onlineHelp: 'qm_startup_and_shutdown',
 
@@ -54,15 +54,17 @@ Ext.define('PVE.qemu.StartupInputPanel', {
     }
 });
 
-Ext.define('PVE.qemu.StartupEdit', {
+Ext.define('PVE.window.StartupEdit', {
     extend: 'PVE.window.Edit',
+    alias: 'widget.pveWindowStartupEdit',
+    onlineHelp: undefined,
 
     initComponent : function() {
 	/*jslint confusion: true */
 
 	var me = this;
-
-	var ipanel = Ext.create('PVE.qemu.StartupInputPanel', {});
+	var ipanelConfig = me.onlineHelp ? {onlineHelp: me.onlineHelp} : {};
+	var ipanel = Ext.create('PVE.panel.StartupInputPanel', ipanelConfig);
 
 	Ext.applyIf(me, {
 	    subject: gettext('Start/Shutdown order'),