diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp
index d0996c2b9..e9f1f71fc 100644
--- a/radio/src/thirdparty/libopenui/src/button.cpp
+++ b/radio/src/thirdparty/libopenui/src/button.cpp
@@ -76,7 +76,7 @@ void TextButton::paint(BitmapBuffer * dc)
   if (bgColorHandler) {
     bgColor = bgColorHandler();
   } else if (checked()) {
-    bgColor = EDIT_MARKER_COLOR;
+    bgColor = HIGHLIGHT_COLOR;
   } else if (hasFocus()) {
     bgColor = FOCUS_BGCOLOR;
   }
@@ -88,7 +88,6 @@ void TextButton::paint(BitmapBuffer * dc)
     } else {
       dc->drawSolidFilledRect(0, 0, rect.w, rect.h, bgColor);
     }
-    textColor = FOCUS_COLOR;
   }
   else {
     dc->drawSolidFilledRect(0, 0, rect.w, rect.h, bgColor);
diff --git a/radio/src/thirdparty/libopenui/src/choice.cpp b/radio/src/thirdparty/libopenui/src/choice.cpp
index c3d8f1468..9be769153 100644
--- a/radio/src/thirdparty/libopenui/src/choice.cpp
+++ b/radio/src/thirdparty/libopenui/src/choice.cpp
@@ -104,7 +104,9 @@ void Choice::setValues(const char * const values[])
 void Choice::paint(BitmapBuffer * dc)
 {
   FormField::paint(dc);
-  theme->drawChoice(dc, this, textHandler ? textHandler(getValue()).c_str() : values[getValue() - vmin].c_str());
+  theme->drawChoice(dc, this,
+                    textHandler ? textHandler(getValue()).c_str()
+                                : values[getValue() - vmin].c_str());
 }
 
 #if defined(HARDWARE_KEYS)
diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 9db5f5d0c..478dd6a13 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -227,6 +227,8 @@ void Menu::onEvent(event_t event)
 
 void Menu::paint(BitmapBuffer * dc)
 {
+  ModalWindow::paint(dc);
+
   rect_t r(content->getRect());
   if (toolbar) {
     r.x = toolbar->left();