diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index 72c888ffe4..74ff749175 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -541,8 +541,9 @@ STATIC_UNIT_TESTED long cmsMenuBack(displayPort_t *pDisplay); // Forward; will b
 
 static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
 {
-    if (!pageTop)
+    if (!pageTop || !cmsInMenu) {
         return;
+    }
 
     uint8_t i;
     const OSD_Entry *p;
diff --git a/src/main/cms/cms_menu_main.c b/src/main/cms/cms_menu_main.c
index a6d55f76c7..4de1a5cd5a 100644
--- a/src/main/cms/cms_menu_main.c
+++ b/src/main/cms/cms_menu_main.c
@@ -115,7 +115,7 @@ static const OSD_Entry menuMainEntries[] =
     {"FC&FIRMWARE", OME_Submenu,  cmsMenuChange, &cmsx_menuFirmware, 0},
     {"MISC",        OME_Submenu,  cmsMenuChange, &cmsx_menuMisc, 0},
     {"SAVE/EXIT",   OME_Funcall,  cmsx_SaveExitMenu, NULL, 0},
-    {NULL,OME_END, NULL, NULL, 0},
+    {NULL, OME_END, NULL, NULL, 0},
 };
 
 CMS_Menu cmsx_menuMain = {