diff --git a/BudgetMasterServer/src/main/resources/static/css/style.css b/BudgetMasterServer/src/main/resources/static/css/style.css
index 04ff080703ec2023fc0e0766553bb69227638b90..385e676b7a1dab6ce5392c839cd09d219d8262e5 100644
--- a/BudgetMasterServer/src/main/resources/static/css/style.css
+++ b/BudgetMasterServer/src/main/resources/static/css/style.css
@@ -353,9 +353,10 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa
 .global-account-select-option {
     display: flex;
     flex-direction: row;
-    align-items: center;
+    align-items: flex-start;
     background-color: var(--color-background);
     border: 3px solid transparent;
+    padding: 0;
 }
 
 .global-account-select-option:hover {
@@ -367,6 +368,23 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa
     margin-left: 2rem;
 }
 
+.global-account-select-option-content {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 24px;
+    width: 95%;
+}
+
+.global-account-select-option-key,
+.global-account-select-option-key-hidden {
+    margin: 0 !important;
+}
+
+.global-account-select-option-key-hidden {
+    background-color: transparent !important;
+}
+
 .login-button {
     text-transform: none;
 }
diff --git a/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl b/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl
index 91d8f78fb3b98660ba00335f7acc8f4b23ef30d0..32ed9b319f4b40b43181265265e2d6d98f0a0436 100644
--- a/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/globalAccountSelectModal.ftl
@@ -29,8 +29,15 @@
                 <div class="col s12 m6 xl6">
                     <a href="<@s.url '/accounts/${account.getID()?c}/select'/>" class="text-default">
                         <div class="card-panel global-account-select-option">
-                            <@customSelectMacros.accountIcon account accountName "category-circle-preview account-icon-big"/>
-                            <div class="global-account-select-option-name truncate">${accountName}</div>
+                            <#if account?index < 10>
+                                <div class="keyboard-key bold global-account-select-option-key">${account?index}</div>
+                            <#else>
+                                <div class="keyboard-key bold global-account-select-option-key-hidden">&nbsp;</div>
+                            </#if>
+                            <div class="global-account-select-option-content">
+                                <@customSelectMacros.accountIcon account accountName "category-circle-preview account-icon-big"/>
+                                <div class="global-account-select-option-name truncate">${accountName}</div>
+                            </div>
                         </div>
                     </a>
                 </div>
diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
index 6184822de6955f9e269f55007dfe8cc3011c2599..13f00e8446d3bd52a341e5cc2ebb57eb9c0e54df 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
@@ -30,6 +30,7 @@
     <@style "categories"/>
     <@style "accounts"/>
     <@style "customSelect"/>
+    <@style "hotkeys"/>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
diff --git a/BudgetMasterServer/src/main/resources/templates/hotkeys.ftl b/BudgetMasterServer/src/main/resources/templates/hotkeys.ftl
index 6362b283882e98402127f15d9bcaccbd7cfef1f5..fde923f3ab550d13e28c01151c08f5f730a89e22 100644
--- a/BudgetMasterServer/src/main/resources/templates/hotkeys.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/hotkeys.ftl
@@ -3,7 +3,6 @@
         <#import "helpers/header.ftl" as header>
         <@header.globals/>
         <@header.header "BudgetMaster - ${locale.getString('menu.hotkeys')}"/>
-        <@header.style "hotkeys"/>
     </head>
     <@header.body>
         <#import "helpers/navbar.ftl" as navbar>