diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
index 3632d5217..c5616d8aa 100644
--- a/radio/src/gui/colorlcd/tabsgroup.cpp
+++ b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -198,8 +198,7 @@ void TabsGroup::setVisibleTab(PageTab* tab)
     auto form = new FormWindow(&body, rect_t{0, 0, body.width(), body.height()},
                                FORM_FORWARD_FOCUS);
     tab->build(form);
-
-    if (!focusWindow) setFocus(SET_FOCUS_DEFAULT);
+    form->setFocus();
 
     header.setTitle(tab->title.c_str());
     invalidate();
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index cfc9dbff1..7dffc2233 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit cfc9dbff183bf0e0371abbacf0365e7c5e2a3145
+Subproject commit 7dffc2233e53376d6f612109a4f051e96109fefb