diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp
index eb8a2fd12..3e094882d 100644
--- a/radio/src/gui/colorlcd/LvglWrapper.cpp
+++ b/radio/src/gui/colorlcd/LvglWrapper.cpp
@@ -204,6 +204,8 @@ static lv_style_t textedit_style_focused;
 static lv_style_t textedit_style_cursor;
 static lv_style_t textedit_style_cursor_edit;
 
+static lv_style_t focus_key_style;
+
 
 static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
 {
@@ -211,6 +213,9 @@ static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
 
   lv_obj_add_style(obj, &generic_style, LV_PART_MAIN);
 
+  lv_obj_add_style(obj, &focus_key_style, LV_STATE_FOCUS_KEY);
+  lv_obj_add_style(obj, &focus_key_style, LV_STATE_EDITED);
+
   lv_obj_t* parent = lv_obj_get_parent(obj);
   if (parent == NULL) {
     // main screen
@@ -245,6 +250,11 @@ static void init_theme()
 {
   /*Initialize the styles*/
 
+  // generic focus outline style to overide default theme
+  lv_style_init(&focus_key_style);
+  lv_style_set_outline_width(&focus_key_style, 0);
+  lv_style_set_outline_opa(&focus_key_style, LV_OPA_0);
+
   // Generic (applied to all)
   lv_style_init(&generic_style);
   lv_style_set_pad_all(&generic_style, 0);
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index e717e3b85..31824ab1f 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit e717e3b85b823b2fc8cd026105b2fdcaef4c9abd
+Subproject commit 31824ab1f0379ff9d204c8e6abaea608579cb594