diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
index d891dae32..771e34299 100644
--- a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
+++ b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp
@@ -353,8 +353,12 @@ void QuickMenu::openQM(PageGroupBase* newPageGroup, QMPage newCurPage)
       setFocus(curPage);
     } else {
 #if VERSION_MAJOR > 2
-      if (curPage == QM_MANAGE_MODELS)
-        mainMenu->setCurrent(favoritesMenuItems[0].icon == EDGETX_ICONS_COUNT ? 0 : 1);
+      for (int i = 0; qmTopItems[i].icon != EDGETX_ICONS_COUNT; i += 1) {
+        if (qmTopItems[i].qmPage == curPage && qmTopItems[i].pageAction == QM_ACTION) {
+          mainMenu->setCurrent(i);
+          break;
+        }
+      }
 #endif
       focusMainMenu();
     }