diff --git a/radio/src/thirdparty/libopenui/src/coloredit.cpp b/radio/src/thirdparty/libopenui/src/coloredit.cpp
index 1e085e576..6ea5936c0 100644
--- a/radio/src/thirdparty/libopenui/src/coloredit.cpp
+++ b/radio/src/thirdparty/libopenui/src/coloredit.cpp
@@ -56,8 +56,8 @@ class ColorBox: public Window {
     LcdFlags color;
 };
 
-ColorEdit::ColorEdit(Window * parent, const rect_t & rect, std::function<uint16_t()> getValue, std::function<void(uint16_t)> setValue):
-  Window(parent, rect, FORWARD_SCROLL)
+ColorEdit::ColorEdit(FormGroup * parent, const rect_t & rect, std::function<uint16_t()> getValue, std::function<void(uint16_t)> setValue):
+  FormGroup(parent, rect, FORWARD_SCROLL | FORM_FORWARD_FOCUS)
 {
   auto width = rect.w / 4 - 5;
 
@@ -77,7 +77,6 @@ ColorEdit::ColorEdit(Window * parent, const rect_t & rect, std::function<uint16_
                      box->setColor(value);
                    });
   }
-
 }
 
 ColorEdit::~ColorEdit()
diff --git a/radio/src/thirdparty/libopenui/src/coloredit.h b/radio/src/thirdparty/libopenui/src/coloredit.h
index e78d91785..4568a7dc5 100644
--- a/radio/src/thirdparty/libopenui/src/coloredit.h
+++ b/radio/src/thirdparty/libopenui/src/coloredit.h
@@ -20,11 +20,11 @@
 #ifndef _COLOREDIT_H_
 #define _COLOREDIT_H_
 
-#include "window.h"
+#include "form.h"
 
-class ColorEdit : public Window {
+class ColorEdit : public FormGroup {
   public:
-    ColorEdit(Window * parent, const rect_t & rect, std::function<uint16_t()> getValue, std::function<void(uint16_t)> setValue = nullptr);
+    ColorEdit(FormGroup * parent, const rect_t & rect, std::function<uint16_t()> getValue, std::function<void(uint16_t)> setValue = nullptr);
 
 #if defined(DEBUG_WINDOWS)
     std::string getName() override