diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index 1d88962be..ca083cbaa 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -39,7 +39,7 @@ void ScreenAddPage::build(FormWindow * window)
 {
   rect_t buttonRect = {LCD_W / 2 - 100, (window->height() - 24) / 2, 200, 24};
   auto button = new TextButton(window, buttonRect, STR_ADD_MAIN_VIEW);
-  button->setPressHandler([=]() {
+  button->setPressHandler([=]() -> uint8_t {
 
       auto& screen     = customScreens[pageIndex];
       auto& screenData = g_model.screenData[pageIndex];
@@ -157,7 +157,7 @@ class SetupWidgetsPageSlot: public Button
       slotIndex(slotIndex)
     {
       widget = screen->getWidget(slotIndex);
-      setPressHandler([=](){
+      setPressHandler([=]() -> uint8_t {
           Menu * menu = new Menu(this);
           menu->addLine(TR_SELECT_WIDGET, [=]() {
             Menu * menu = new Menu(this);
@@ -165,24 +165,17 @@ class SetupWidgetsPageSlot: public Button
               menu->addLine(factory->getName(), [=]() {
                 if (widget) widget->deleteLater();
                 widget = screen->createWidget(slotIndex, factory);
-                return 0;
               });
             }
-            return 0;
           });
           if (widget) {
             menu->addLine(TR_WIDGET_SETTINGS, [=]() {
-                new WidgetSettings(this, widget, [=]() {
-                  TRACE("WidgetSettings confirmed");
-                  deleteLater();
-                  return;
-                });
+                new WidgetSettings(this, widget);
             });
 
             menu->addLine(STR_REMOVE_WIDGET, [=]() {
               widget->deleteLater();
               widget = nullptr;
-              return 0;
             });
           }
           return 0;
@@ -282,7 +275,7 @@ void ScreenSetupPage::build(FormWindow * window)
 
   // Setup widgets button...
   setupWidgetsButton = new TextButton(window, grid.getFieldSlot(), STR_SETUP_WIDGETS);
-  setupWidgetsButton->setPressHandler([=]() {
+  setupWidgetsButton->setPressHandler([=]() -> uint8_t {
       new SetupWidgetsPage(screen);
       return 0;
   });
@@ -325,7 +318,7 @@ void ScreenSetupPage::updateLayoutOptions()
 
   //if (pageIndex > 0 || customScreens[1]) {
     auto button = new TextButton(optionsWindow, grid.getFieldSlot(), STR_REMOVE_SCREEN);
-    button->setPressHandler([=]() {
+    button->setPressHandler([=]() -> uint8_t {
         // if (pageIndex < MAX_CUSTOM_SCREENS - 1) {
         //   memmove(&g_model.screenData[pageIndex], &g_model.screenData[pageIndex + 1], sizeof(CustomScreenData) * (MAX_CUSTOM_SCREENS - pageIndex - 1));
         // }
diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp
index caf862712..d571f4bb2 100644
--- a/radio/src/gui/colorlcd/widget_settings.cpp
+++ b/radio/src/gui/colorlcd/widget_settings.cpp
@@ -28,10 +28,11 @@ static const rect_t widgetSettingsDialogRect = {
   LCD_H - 2 * LCD_H / 4   // height
 };
 
-WidgetSettings::WidgetSettings(Window * parent, Widget * widget, std::function<void(void)> confirmHandler) :
-  Dialog(parent, TR_WIDGET_SETTINGS, widgetSettingsDialogRect),
-  confirmHandler(std::move(confirmHandler))
+WidgetSettings::WidgetSettings(Window * parent, Widget * widget) :
+  Dialog(parent, TR_WIDGET_SETTINGS, widgetSettingsDialogRect)
 {
+  setCloseWhenClickOutside(true);
+
   auto form = &content->form;
   FormGridLayout grid(content->form.width());
   grid.setLabelWidth(width() / 5);
@@ -134,3 +135,15 @@ WidgetSettings::WidgetSettings(Window * parent, Widget * widget, std::function<v
     grid.nextLine();
   }
 }
+
+
+#if defined(HARDWARE_KEYS)
+void WidgetSettings::onEvent(event_t event)
+{
+  TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event);
+
+  if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
+    deleteLater();
+  }
+}
+#endif
diff --git a/radio/src/gui/colorlcd/widget_settings.h b/radio/src/gui/colorlcd/widget_settings.h
index 9f59e95db..cf44cb765 100644
--- a/radio/src/gui/colorlcd/widget_settings.h
+++ b/radio/src/gui/colorlcd/widget_settings.h
@@ -28,5 +28,9 @@ class WidgetSettings: public Dialog
     std::function<void(void)> confirmHandler;
     
   public:
-    WidgetSettings(Window * parent, Widget * widget, std::function<void(void)> confirmHandler);
+    WidgetSettings(Window * parent, Widget * widget);
+
+#if defined(HARDWARE_KEYS)
+    void onEvent(event_t event) override;
+#endif
 };