From 8f4880409d3f15f282a4a354dcda6e37a9d63cf0 Mon Sep 17 00:00:00 2001
From: Asizon <43983086+Asizon@users.noreply.github.com>
Date: Thu, 16 Jan 2020 10:16:38 +0100
Subject: [PATCH] Fix CMS Menu Navigation

---
 src/main/cms/cms.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index ab8cfa2997..3ffacc7bb3 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -902,11 +902,10 @@ STATIC_UNIT_TESTED uint16_t cmsHandleKey(displayPort_t *pDisplay, cms_key_e key)
     if ((key == CMS_KEY_UP) && (!osdElementEditing)) {
         currentCtx.cursorRow--;
 
-        // Skip non-title labels
-        if ((pageTop + currentCtx.cursorRow)->type == OME_Label && currentCtx.cursorRow > 0) {
+        // Skip non-title labels and strings
+        while (((pageTop + currentCtx.cursorRow)->type == OME_Label || (pageTop + currentCtx.cursorRow)->type == OME_String) && currentCtx.cursorRow > 0) {
             currentCtx.cursorRow--;
         }
-
         if (currentCtx.cursorRow == -1 || (pageTop + currentCtx.cursorRow)->type == OME_Label) {
             // Goto previous page
             cmsPagePrev(pDisplay);