diff --git a/radio/src/thirdparty/libopenui/src/basenumberedit.h b/radio/src/thirdparty/libopenui/src/basenumberedit.h
index c1314c97f..f85f8754e 100644
--- a/radio/src/thirdparty/libopenui/src/basenumberedit.h
+++ b/radio/src/thirdparty/libopenui/src/basenumberedit.h
@@ -82,7 +82,7 @@ class BaseNumberEdit : public FormField {
 
     void setSetValueHandler(std::function<void(int32_t)> handler)
     {
-      _setValue = handler;
+      _setValue = std::move(handler);
     }
 
     int32_t getValue() const
diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp
index 2802fc822..e36516d52 100644
--- a/radio/src/thirdparty/libopenui/src/form.cpp
+++ b/radio/src/thirdparty/libopenui/src/form.cpp
@@ -48,11 +48,11 @@ void FormField::onEvent(event_t event)
     }
   }
   else if (event == EVT_KEY_BREAK(KEY_ENTER)) {
-    editMode = !editMode;
+    setEditMode(!editMode);
     invalidate();
   }
   else if (event == EVT_KEY_BREAK(KEY_EXIT) && editMode) {
-    editMode = false;
+    setEditMode(false);
     invalidate();
   }
   else {
diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h
index da8927b26..2f4a7a43b 100644
--- a/radio/src/thirdparty/libopenui/src/form.h
+++ b/radio/src/thirdparty/libopenui/src/form.h
@@ -57,7 +57,7 @@ class FormField: public Window {
       return editMode;
     }
 
-    inline void setEditMode(bool newEditMode)
+    virtual void setEditMode(bool newEditMode)
     {
       editMode = newEditMode;
     }
@@ -82,7 +82,7 @@ class FormField: public Window {
 
     void onFocusLost() override
     {
-      editMode = false;
+      setEditMode(false);
       Window::onFocusLost();
     }