diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
index 3280f1580c2..343d1670e86 100644
--- a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+++ b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
@@ -386,7 +386,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
   node["modelCustomScriptsDisabled"] = (int)rhs.modelCustomScriptsDisabled;
   node["modelTelemetryDisabled"] = (int)rhs.modelTelemetryDisabled;
 
-  if (hasColorLcd && VERSION_MAJOR > 2) {
+  if (hasColorLcd) {
     for (int i = 0; i < MAX_KEYSHORTCUTS; i += 1)
       if (rhs.keyShortcuts[i] != GeneralSettings::QM_NONE)
         node["keyShortcuts"][std::to_string(i)]["shortcut"] = QMPageLut << rhs.keyShortcuts[i];
diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp
index 6ffdbe6150a..3b0cbf01102 100644
--- a/companion/src/firmwares/generalsettings.cpp
+++ b/companion/src/firmwares/generalsettings.cpp
@@ -1092,9 +1092,9 @@ void GeneralSettings::setDefaultFavorites()
 void GeneralSettings::setDefaultKeyShortcuts()
 {
   keyShortcuts[0] = QM_MODEL_SETUP;       // MDL short
-  keyShortcuts[1] = (VERSION_MAJOR == 2) ? QM_TOOLS_APPS : QM_OPEN_QUICK_MENU;   // SYS short
+  keyShortcuts[1] = QM_OPEN_QUICK_MENU;   // SYS short
   keyShortcuts[2] = QM_UI_SCREEN1;        // TELE short
   keyShortcuts[3] = QM_MANAGE_MODELS;     // MDL long
-  keyShortcuts[4] = (VERSION_MAJOR == 2) ? QM_RADIO_SETUP : QM_TOOLS_APPS;       // SYS long
+  keyShortcuts[4] = QM_TOOLS_APPS;        // SYS long
   keyShortcuts[5] = QM_TOOLS_CHAN_MON;    // TELE long
 }
diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
index cc4b18e274e..a95dd9ed3e7 100644
--- a/radio/src/datastructs_private.h
+++ b/radio/src/datastructs_private.h
@@ -1162,13 +1162,8 @@ PACK(struct RadioData {
   NOBACKUP(uint8_t pwrOffIfInactive);
 
 #if defined(COLORLCD)
-#if VERSION_MAJOR == 2
-  NOBACKUP(QuickMenuPage keyShortcuts[MAX_KEY_SHORTCUTS] SKIP);
-  NOBACKUP(QuickMenuPage qmFavorites[MAX_QM_FAVORITES] SKIP);
-#else
   NOBACKUP(QuickMenuPage keyShortcuts[MAX_KEY_SHORTCUTS]);
   NOBACKUP(QuickMenuPage qmFavorites[MAX_QM_FAVORITES]);
-#endif
 #endif
 
   NOBACKUP(uint8_t getBrightness() const
diff --git a/radio/src/datastructs_radio.cpp b/radio/src/datastructs_radio.cpp
index 30945af1607..354b285c152 100644
--- a/radio/src/datastructs_radio.cpp
+++ b/radio/src/datastructs_radio.cpp
@@ -95,6 +95,30 @@ void RadioData::cfsSetOffColorLuaOverride(uint8_t n, bool v) {
 QMPage RadioData::getKeyShortcut(event_t event)
 {
   QMPage page = QM_NONE;
+#if VERSION_MAJOR == 2
+  switch(event) {
+    case EVT_KEY_BREAK(KEY_MODEL):
+      page = QM_MODEL_SETUP;
+      break;
+    case EVT_KEY_BREAK(KEY_SYS):
+      page = QM_TOOLS_APPS;
+      break;
+    case EVT_KEY_BREAK(KEY_TELE):
+      page = QM_UI_SCREEN1;
+      break;
+    case EVT_KEY_LONG(KEY_MODEL):
+      page = QM_MANAGE_MODELS;
+      break;
+    case EVT_KEY_LONG(KEY_SYS):
+      page = QM_RADIO_SETUP;
+      break;
+    case EVT_KEY_LONG(KEY_TELE):
+      page = QM_TOOLS_CHAN_MON;
+      break;
+    default:
+      break;
+  }
+#else
   switch(event) {
     case EVT_KEY_BREAK(KEY_MODEL):
       page = (QMPage)keyShortcuts[0].shortcut;
@@ -117,6 +141,7 @@ QMPage RadioData::getKeyShortcut(event_t event)
     default:
       break;
   }
+#endif
   if (page >= QM_UI_SCREEN1 && page <= QM_UI_SCREEN10)
     page = (QMPage)(QM_UI_SCREEN1 + ViewMain::instance()->getCurrentMainView());
   return page;
@@ -160,13 +185,8 @@ void RadioData::defaultKeyShortcuts()
 {
   setKeyShortcut(EVT_KEY_BREAK(KEY_MODEL), QM_MODEL_SETUP);
   setKeyShortcut(EVT_KEY_LONG(KEY_MODEL), QM_MANAGE_MODELS);
-#if VERSION_MAJOR == 2
-  setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_TOOLS_APPS);
-  setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_RADIO_SETUP);
-#else
   setKeyShortcut(EVT_KEY_BREAK(KEY_SYS), QM_OPEN_QUICK_MENU);
   setKeyShortcut(EVT_KEY_LONG(KEY_SYS), QM_TOOLS_APPS);
-#endif
   setKeyShortcut(EVT_KEY_BREAK(KEY_TELE), QM_UI_SCREEN1);
   setKeyShortcut(EVT_KEY_LONG(KEY_TELE), QM_TOOLS_CHAN_MON);
 }
diff --git a/radio/src/storage/yaml/yaml_datastructs_f16.cpp b/radio/src/storage/yaml/yaml_datastructs_f16.cpp
index 34ab7ef7a4f..3d6ee52e489 100644
--- a/radio/src/storage/yaml/yaml_datastructs_f16.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_f16.cpp
@@ -447,8 +447,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
index 522e53b2661..8db20644583 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
@@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index 32920543f0f..20a04c45997 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp
index 49ec3819aba..5f3392a0555 100644
--- a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp
@@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
index 4710850b84d..6c3bb5fc780 100644
--- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
@@ -445,8 +445,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
index a55311fdd1f..8dfd18c660b 100644
--- a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
@@ -438,8 +438,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_st16.cpp b/radio/src/storage/yaml/yaml_datastructs_st16.cpp
index 57ab249a20a..a59adaa6a15 100644
--- a/radio/src/storage/yaml/yaml_datastructs_st16.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_st16.cpp
@@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_t15.cpp b/radio/src/storage/yaml/yaml_datastructs_t15.cpp
index 3d366204026..bab90cd2984 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t15.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t15.cpp
@@ -455,8 +455,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
index 57ab249a20a..a59adaa6a15 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
@@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp
index 57ab249a20a..a59adaa6a15 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp
@@ -470,8 +470,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
index 158a8911baa..2a219413e40 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -446,8 +446,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "modelQuickSelect", 1 ),
   YAML_PADDING( 5 ),
   YAML_UNSIGNED( "pwrOffIfInactive", 8 ),
-  YAML_PADDING( 48 ),
-  YAML_PADDING( 96 ),
+  YAML_ARRAY("keyShortcuts", 8, 6, struct_QuickMenuPage, NULL),
+  YAML_ARRAY("qmFavorites", 8, 12, struct_QuickMenuPage, NULL),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {