diff --git a/emhttp/plugins/dynamix/BootMode.page b/emhttp/plugins/dynamix/BootMode.page
new file mode 100644
index 000000000..d3475ecbb
--- /dev/null
+++ b/emhttp/plugins/dynamix/BootMode.page
@@ -0,0 +1,45 @@
+Menu="Flash:999"
+Title="Boot Mode"
+Tag="edit"
+---
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+
+<script>
+function prepareBootMode(form) {
+  form['#arg[1]'].value = form.boot.checked ? 1 : 0;
+}
+</script>
+<form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareBootMode(this)">
+<input type="hidden" name="#include" value="/webGui/include/update.file.php">
+<input type="hidden" name="#command" value="/webGui/scripts/bootmode">
+<input type="hidden" name="#arg[1]" value="">
+
+_(Server boot mode)_:
+: <?=is_dir('/sys/firmware/efi') ? 'UEFI' : 'Legacy'?>
+
+_(Boot system in UEFI mode)_:
+: <label>
+    <input type="checkbox" name="boot" <?=is_dir('/boot/EFI')?'checked':''?>>
+    _(Permit UEFI boot mode)_
+  </label>
+  *_(Please check your system settings to support UEFI boot mode)_.*
+
+&nbsp;
+: <span class="inline-block">
+    <input type="submit" value="_(Apply)_">
+    <input type="button" value="_(Done)_" onclick="done()">
+  </span>
+
+</form>
+
diff --git a/emhttp/plugins/dynamix/Syslinux.page b/emhttp/plugins/dynamix/Syslinux.page
index cc22db341..e75ef825f 100644
--- a/emhttp/plugins/dynamix/Syslinux.page
+++ b/emhttp/plugins/dynamix/Syslinux.page
@@ -45,7 +45,6 @@ Array.prototype.spliceArray = function(i,n,a) {
   return Array.prototype.splice.apply(this,[i,n].concat(a));
 };
 function prepareMenu(form) {
-  $('input[name="#arg[1]"]').val(form.boot.checked?1:0);
   if ($('div.basic').is(':visible')) {
     var label = [], area = [];
     $(form).find('label[id^=label]').each(function(){
@@ -186,8 +185,6 @@ $(function(){
 <form markdown="1" method="POST" action="/update.php" target="progressFrame" onsubmit="prepareMenu(this)">
 <input type="hidden" name="#include" value="/webGui/include/update.file.php">
 <input type="hidden" name="#file" value="<?=$file;?>">
-<input type="hidden" name="#command" value="/webGui/scripts/bootmode">
-<input type="hidden" name="#arg[1]" value="">
 <input type="hidden" name="text" value="">
 
 <div markdown="1" class="basic">
@@ -215,16 +212,6 @@ _(Syslinux configuration)_:
 : <textarea class="raw config-raw" name="raw" spellcheck="false" cols="80" rows="<?=substr_count($current,"\n")+1?>" maxlength="2048"><?=htmlspecialchars($current)?></textarea>
 
 </div>
-_(Server boot mode)_:
-: <?=is_dir('/sys/firmware/efi') ? 'UEFI' : 'Legacy'?>
-
-_(Boot system in UEFI mode)_:
-: <label>
-    <input type="checkbox" name="boot" <?=is_dir('/boot/EFI')?'checked':''?>>
-    _(Permit UEFI boot mode)_
-  </label>
-  *_(Please check your system settings to support UEFI boot mode)_.*
-
 <input type="button" value="_(Default)_" onclick="setDefault(this.form)">
 : <span class="inline-block">
     <input type="submit" value="_(Apply)_">