diff --git a/frontend/src/features/system/SiteHeader.tsx b/frontend/src/features/system/SiteHeader.tsx
index 4079f6f414..da263010ec 100644
--- a/frontend/src/features/system/SiteHeader.tsx
+++ b/frontend/src/features/system/SiteHeader.tsx
@@ -44,13 +44,15 @@ const SiteHeader = () => {
         <StatusIndicator />
 
         <HotkeysModal>
-          <IconButton
-            aria-label="Hotkeys"
-            variant="link"
-            fontSize={24}
-            size={'sm'}
-            icon={<MdKeyboard />}
-          />
+          <Tooltip hasArrow label="Hotkeys" placement={'bottom'}>
+            <IconButton
+              aria-label="Hotkeys"
+              variant="link"
+              fontSize={24}
+              size={'sm'}
+              icon={<MdKeyboard />}
+            />
+          </Tooltip>
         </HotkeysModal>
 
         <Tooltip hasArrow label="Theme" placement={'bottom'}>
@@ -110,13 +112,15 @@ const SiteHeader = () => {
         </Tooltip>
 
         <SettingsModal>
-          <IconButton
-            aria-label="Settings"
-            variant="link"
-            fontSize={24}
-            size={'sm'}
-            icon={<MdSettings />}
-          />
+          <Tooltip label="Settings">
+            <IconButton
+              aria-label="Settings"
+              variant="link"
+              fontSize={24}
+              size={'sm'}
+              icon={<MdSettings />}
+            />
+          </Tooltip>
         </SettingsModal>
       </div>
     </div>