diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index 7288a662b..b981992d2 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -182,7 +182,7 @@ class SetupWidgetsPage: public FormWindow
 #if defined(DEBUG_WINDOWS)
     std::string getName() const override
     {
-      return "SetupWidgetPage(idx=" + std::to_string(customScreenIdx) + ")";
+      return "SetupWidgetsPage(idx=" + std::to_string(customScreenIdx) + ")";
     }
 #endif
 
@@ -342,7 +342,7 @@ ScreenSetupPage::ScreenSetupPage(ScreenMenu * menu, unsigned pageIndex, unsigned
 
 
 
-static void updateLayoutOptions(FormGroup* optionsWindow, unsigned customScreenIndex) // TODO
+static void updateLayoutOptions(FormGroup* optionsWindow, unsigned customScreenIndex)
 {
   FormGridLayout grid;
   optionsWindow->clear();
diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp
index 39756062b..4d05cd7e1 100644
--- a/radio/src/gui/colorlcd/widget_settings.cpp
+++ b/radio/src/gui/colorlcd/widget_settings.cpp
@@ -144,6 +144,10 @@ WidgetSettings::WidgetSettings(Window * parent, Widget * widget) :
     optPtr++;
     grid.nextLine();
   }
+
+  setCloseHandler([widget]() {
+      widget->update();
+  });
 }