diff --git a/web/kvm/index.html b/web/kvm/index.html
index b14c8720..3d10ed8c 100644
--- a/web/kvm/index.html
+++ b/web/kvm/index.html
@@ -407,9 +407,6 @@
           </div>
         </div>
       </li>
-      <li class="right feature-disabled" id="gpio-dropdown"><a class="menu-button" id="gpio-menu-button" href="#">GPIO</a>
-        <div class="menu" data-dont-hide-menu id="gpio-menu"></div>
-      </li>
       <li class="right"><a class="menu-button" href="#"><img class="led-gray" data-dont-hide-menu id="hid-recorder-led" src="/share/svg/led-gear.svg">Macro</a>
         <div class="menu" data-dont-hide-menu>
           <div class="text"><b>Record and play keyboard &amp; mouse actions<br></b><sub>For security reasons, the record will not be saved on the Pi-KVM</sub></div>
@@ -452,7 +449,7 @@
           </div>
         </div>
       </li>
-      <li class="right"><a class="menu-button" href="#">Shortcuts</a>
+      <li class="right"><a class="menu-button" href="#">Keyboard</a>
         <div class="menu" data-dont-hide-menu>
           <div class="text"><b>Paste text as keypress sequence<br></b></div>
           <hr>
@@ -529,6 +526,9 @@
           </div>
         </div>
       </li>
+      <li class="right feature-disabled" id="gpio-dropdown"><a class="menu-button" id="gpio-menu-button" href="#">GPIO</a>
+        <div class="menu" data-dont-hide-menu id="gpio-menu"></div>
+      </li>
     </ul>
     <div class="window window-resizable" id="stream-window" data-show-by-button="show-stream-button">
       <div class="window-header" id="stream-window-header">
diff --git a/web/kvm/navbar-shortcuts.pug b/web/kvm/navbar-keyboard.pug
similarity index 98%
rename from web/kvm/navbar-shortcuts.pug
rename to web/kvm/navbar-keyboard.pug
index 401b1d6b..ce526f76 100644
--- a/web/kvm/navbar-shortcuts.pug
+++ b/web/kvm/navbar-keyboard.pug
@@ -1,5 +1,5 @@
 li(class="right")
-	a(class="menu-button" href="#") Shortcuts
+	a(class="menu-button" href="#") Keyboard
 	div(data-dont-hide-menu class="menu")
 		div(class="text")
 			b Paste text as keypress sequence#[br]
diff --git a/web/kvm/navbar.pug b/web/kvm/navbar.pug
index c86d5cb6..ebe5cb20 100644
--- a/web/kvm/navbar.pug
+++ b/web/kvm/navbar.pug
@@ -37,6 +37,6 @@ ul(id="navbar")
 	include navbar-system.pug
 	include navbar-atx.pug
 	include navbar-msd.pug
-	include navbar-gpio.pug
 	include navbar-macro.pug
-	include navbar-shortcuts.pug
+	include navbar-keyboard.pug
+	include navbar-gpio.pug