diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index e0b000188..9480bebe5 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -1466,14 +1466,17 @@ void InkHUD::MenuApplet::onNavUp()
 {
     OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
 
-    // Move menu cursor to previous entry, then update
-    if (cursor == 0)
-        cursor = items.size() - 1;
-    else
-        cursor--;
-
-    if (!cursorShown)
+    if (!cursorShown) {
         cursorShown = true;
+        cursor = 0;
+    } else {
+        do {
+            if (cursor == 0)
+                cursor = items.size() - 1;
+            else
+                cursor--;
+        } while (items.at(cursor).isHeader);
+    }
 
     requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }
@@ -1482,11 +1485,14 @@ void InkHUD::MenuApplet::onNavDown()
 {
     OSThread::setIntervalFromNow(MENU_TIMEOUT_SEC * 1000UL);
 
-    // Move menu cursor to next entry, then update
-    if (cursorShown)
-        cursor = (cursor + 1) % items.size();
-    else
+    if (!cursorShown) {
         cursorShown = true;
+        cursor = 0;
+    } else {
+        do {
+            cursor = (cursor + 1) % items.size();
+        } while (items.at(cursor).isHeader);
+    }
 
     requestUpdate(Drivers::EInk::UpdateTypes::FAST);
 }
diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
index 6cd91d628..b418236bd 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
@@ -157,7 +157,7 @@ void InkHUD::TipsApplet::onRender()
             cursorY += fontSmall.lineHeight() * 1.2;
             printAt(0, cursorY, "- switch tile / close menu");
         }
-        int16_t cursorY = h + fontSmall.lineHeight();
+        cursorY = h + fontSmall.lineHeight();
 
         auto drawBullet = [&](const char *text) {
             uint16_t bh = getWrappedTextHeight(0, width(), text);