From 1d4c723c9df5ecc2509bb04a288a1b3bb23ec095 Mon Sep 17 00:00:00 2001
From: philmoz <philmoz@users.noreply.github.com>
Date: Wed, 3 Jun 2026 13:39:03 +1000
Subject: [PATCH] fix(color): cleanup correct screen layout when changing
 models (#7385)

---
 radio/src/gui/colorlcd/model/model_select.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/colorlcd/model/model_select.cpp b/radio/src/gui/colorlcd/model/model_select.cpp
index 5946ef3e9..6e59ec294 100644
--- a/radio/src/gui/colorlcd/model/model_select.cpp
+++ b/radio/src/gui/colorlcd/model/model_select.cpp
@@ -365,11 +365,13 @@ class ModelsPageBody : public Window
       memcpy(g_eeGeneral.currModelFilename, model->modelFilename,
              LEN_MODEL_FILENAME);
 
+      // Delete old main view layout
+      LayoutFactory::deleteCustomScreens();
+
       loadModel(g_eeGeneral.currModelFilename, true);
       modelslist.setCurrentModel(model);
 
-      // Main view layout
-      LayoutFactory::deleteCustomScreens();
+      // Load new main view layout
       LayoutFactory::loadCustomScreens();
 
       storageDirty(EE_GENERAL);