diff --git a/radio/src/thirdparty/libopenui/src/expansion_panel.h b/radio/src/thirdparty/libopenui/src/expansion_panel.h
index 09841bb86..f26292f13 100644
--- a/radio/src/thirdparty/libopenui/src/expansion_panel.h
+++ b/radio/src/thirdparty/libopenui/src/expansion_panel.h
@@ -28,6 +28,13 @@ class ExpansionPanelHeader: virtual public FormGroup {
   public:
     explicit ExpansionPanelHeader(ExpansionPanel * parent);
 
+#if defined(DEBUG_WINDOWS)
+    std::string getName() override
+    {
+      return "ExpansionPanelHeader";
+    }
+#endif
+
     void onEvent(event_t event) override;
 
 #if defined(HARDWARE_TOUCH)
@@ -48,7 +55,7 @@ class ExpansionPanel: public FormGroup {
 #if defined(DEBUG_WINDOWS)
     std::string getName() override
     {
-      return "ExpansionPanel()";
+      return "ExpansionPanel";
     }
 #endif
 
diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h
index ba7253bb6..3a71b84cc 100644
--- a/radio/src/thirdparty/libopenui/src/form.h
+++ b/radio/src/thirdparty/libopenui/src/form.h
@@ -111,6 +111,11 @@ class FormGroup: public FormField {
 
     void addField(FormField * field, bool front = false);
 
+    void setLastField(FormField * field)
+    {
+      last = field;
+    }
+
   protected:
     FormField * first = nullptr;
     FormField * last = nullptr;
diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h
index 8a49b3ace..bbf020cb2 100644
--- a/radio/src/thirdparty/libopenui/src/window.h
+++ b/radio/src/thirdparty/libopenui/src/window.h
@@ -273,8 +273,12 @@ class Window {
       }
       else {
         coord_t maxScrollPosition = h - height();
-        if (scrollPositionY > maxScrollPosition)
+        if (scrollPositionY > maxScrollPosition) {
           setScrollPositionY(maxScrollPosition);
+        }
+        else {
+          invalidate();
+        }
       }
     }