diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index a7944bbdc..ed43571f9 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -365,8 +365,8 @@ static void updateLayoutOptions(FormGroup* optionsWindow, unsigned customScreenI
 
   for (auto * option = factory->getOptions(); option->name; option++, index++) {
 
-    auto& layoutData = g_model.screenData[customScreenIndex].layoutData;
-    ZoneOptionValue * value = &layoutData.options[index].value;
+    auto layoutData = &g_model.screenData[customScreenIndex].layoutData;
+    ZoneOptionValue * value = &layoutData->options[index].value;
 
     // Option label
     new StaticText(optionsWindow, grid.getLabelSlot(false), option->name);