diff --git a/radio/src/gui/colorlcd/preflight_checks.cpp b/radio/src/gui/colorlcd/preflight_checks.cpp
index 3d0b9a96b..fbd9bd8a9 100644
--- a/radio/src/gui/colorlcd/preflight_checks.cpp
+++ b/radio/src/gui/colorlcd/preflight_checks.cpp
@@ -124,7 +124,7 @@ PreflightChecks::PreflightChecks() : Page(ICON_MODEL_SETUP)
   make_conditional(line, tw);
 
   new StaticText(line, rect_t{}, STR_CUSTOM_THROTTLE_WARNING, 0, COLOR_THEME_PRIMARY1);
-  auto box = new FormGroup::Line(line, lv_obj_create(line->getLvObj()), nullptr, form);
+  auto box = new FormGroup::Line(line, window_create(line->getLvObj()), nullptr, form);
   lv_obj_set_layout(box->getLvObj(), LV_LAYOUT_FLEX);
 
   auto cst_tw = new CheckBox(
diff --git a/radio/src/gui/colorlcd/splash.cpp b/radio/src/gui/colorlcd/splash.cpp
index 7a78e24b3..416cf63c1 100644
--- a/radio/src/gui/colorlcd/splash.cpp
+++ b/radio/src/gui/colorlcd/splash.cpp
@@ -87,7 +87,7 @@ void drawSplash()
       }
     }
 
-    splashScreen = lv_obj_create(nullptr);
+    splashScreen = window_create(nullptr);
     if (splashScreen) {
       lv_obj_add_event_cb(splashScreen, draw_splash_cb, LV_EVENT_DRAW_MAIN, splashImg);
     }
diff --git a/radio/src/gui/colorlcd/timer_setup.cpp b/radio/src/gui/colorlcd/timer_setup.cpp
index d21f7b85f..f9227d95f 100644
--- a/radio/src/gui/colorlcd/timer_setup.cpp
+++ b/radio/src/gui/colorlcd/timer_setup.cpp
@@ -88,7 +88,7 @@ TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS)
   line = body.newLine(&grid);
   new StaticText(line, rect_t{}, STR_BEEPCOUNTDOWN, 0, COLOR_THEME_PRIMARY1);
 
-  auto box = new FormGroup::Line(line, lv_obj_create(line->getLvObj()), nullptr, &body);
+  auto box = new FormGroup::Line(line, window_create(line->getLvObj()), nullptr, &body);
   lv_obj_set_layout(box->getLvObj(), LV_LAYOUT_FLEX);
   new Choice(box, rect_t{}, STR_VBEEPCOUNTDOWN, COUNTDOWN_SILENT,
              COUNTDOWN_COUNT - 1, GET_SET_DEFAULT(p_timer->countdownBeep));
diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp
index a41d3c6b6..7f0a2333b 100644
--- a/radio/src/gui/colorlcd/view_main_decoration.cpp
+++ b/radio/src/gui/colorlcd/view_main_decoration.cpp
@@ -36,7 +36,7 @@ static Window* create_layout_box(Window* parent, lv_align_t align,
 {
   lv_obj_t* lv_parent = parent->getLvObj();
 
-  auto box = lv_obj_create(lv_parent);
+  auto box = window_create(lv_parent);
   lv_obj_set_size(box, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
   lv_obj_set_align(box, align);
   lv_obj_set_flex_flow(box, flow);
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index d4641dada..7d0e14d83 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit d4641dadacba923eeaeec17f7869f12d61befbad
+Subproject commit 7d0e14d831084dc824371a35f3d343abe221814c