diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
index 6aca33208..fa13cbe8a 100644
--- a/frontend/ui/uimanager.lua
+++ b/frontend/ui/uimanager.lua
@@ -467,16 +467,16 @@ function UIManager:close(widget, refreshtype, refreshregion, refreshdither)
     end
     logger.dbg("close widget:", widget.name or widget.id or tostring(widget))
     local dirty = false
-    -- Ensure all the widgets can get onFlushSettings event.
+    -- First notify the closed widget to save its settings...
     widget:handleEvent(Event:new("FlushSettings"))
-    -- first send close event to widget
+    -- ...and notify it that it ought to be gone now.
     widget:handleEvent(Event:new("CloseWidget"))
-    -- make it disabled by default and check if any widget wants it disabled or enabled
+    -- Make sure it's disabled by default and check if there are any widgets that want it disabled or enabled.
     Input.disable_double_tap = true
     local requested_disable_double_tap = nil
     local is_covered = false
     local start_idx = 1
-    -- then remove all references to that widget on stack and refresh
+    -- Then remove all references to that widget on stack and refresh.
     for i = #self._window_stack, 1, -1 do
         if self._window_stack[i].widget == widget then
             self._dirty[self._window_stack[i].widget] = nil
diff --git a/frontend/ui/widget/datewidget.lua b/frontend/ui/widget/datewidget.lua
index 4fdef411d..2f3291523 100644
--- a/frontend/ui/widget/datewidget.lua
+++ b/frontend/ui/widget/datewidget.lua
@@ -210,7 +210,6 @@ function DateWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.date_frame.dimen
     end)
-    return true
 end
 
 function DateWidget:onShow()
diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua
index 3d45cf472..b2a345821 100644
--- a/frontend/ui/widget/dictquicklookup.lua
+++ b/frontend/ui/widget/dictquicklookup.lua
@@ -909,7 +909,6 @@ function DictQuickLookup:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "flashui", nil
     end)
-    return true
 end
 
 function DictQuickLookup:onShow()
diff --git a/frontend/ui/widget/doublespinwidget.lua b/frontend/ui/widget/doublespinwidget.lua
index e24e71e30..cfba7505a 100644
--- a/frontend/ui/widget/doublespinwidget.lua
+++ b/frontend/ui/widget/doublespinwidget.lua
@@ -295,7 +295,6 @@ function DoubleSpinWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.widget_frame.dimen
     end)
-    return true
 end
 
 function DoubleSpinWidget:onShow()
diff --git a/frontend/ui/widget/frontlightwidget.lua b/frontend/ui/widget/frontlightwidget.lua
index 5fd241670..c73f9af28 100644
--- a/frontend/ui/widget/frontlightwidget.lua
+++ b/frontend/ui/widget/frontlightwidget.lua
@@ -583,7 +583,6 @@ function FrontLightWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "flashui", self.light_frame.dimen
     end)
-    return true
 end
 
 function FrontLightWidget:onShow()
diff --git a/frontend/ui/widget/imageviewer.lua b/frontend/ui/widget/imageviewer.lua
index c69eff1f4..7cd9f5cd2 100644
--- a/frontend/ui/widget/imageviewer.lua
+++ b/frontend/ui/widget/imageviewer.lua
@@ -850,7 +850,6 @@ function ImageViewer:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "flashui", self.main_frame.dimen
     end)
-    return true
 end
 
 return ImageViewer
diff --git a/frontend/ui/widget/infomessage.lua b/frontend/ui/widget/infomessage.lua
index dec9f6d75..7ae72ff08 100644
--- a/frontend/ui/widget/infomessage.lua
+++ b/frontend/ui/widget/infomessage.lua
@@ -206,16 +206,15 @@ function InfoMessage:onCloseWidget()
     end
     if self.invisible then
         -- Still invisible, no setDirty needed
-        return true
+        return
     end
     if self.no_refresh_on_close then
-        return true
+        return
     end
 
     UIManager:setDirty(nil, function()
         return "ui", self[1][1].dimen
     end)
-    return true
 end
 
 function InfoMessage:onShow()
diff --git a/frontend/ui/widget/keyboardlayoutdialog.lua b/frontend/ui/widget/keyboardlayoutdialog.lua
index 8fadc4439..5296afcd6 100644
--- a/frontend/ui/widget/keyboardlayoutdialog.lua
+++ b/frontend/ui/widget/keyboardlayoutdialog.lua
@@ -157,7 +157,6 @@ function KeyboardLayoutDialog:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self[1][1].dimen
     end)
-    return true
 end
 
 return KeyboardLayoutDialog
diff --git a/frontend/ui/widget/linkbox.lua b/frontend/ui/widget/linkbox.lua
index 59f03bf65..1003621a9 100644
--- a/frontend/ui/widget/linkbox.lua
+++ b/frontend/ui/widget/linkbox.lua
@@ -38,7 +38,6 @@ function LinkBox:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "partial", self.box
     end)
-    return true
 end
 
 function LinkBox:onShow()
diff --git a/frontend/ui/widget/naturallightwidget.lua b/frontend/ui/widget/naturallightwidget.lua
index 594b65ce5..d10714b0c 100644
--- a/frontend/ui/widget/naturallightwidget.lua
+++ b/frontend/ui/widget/naturallightwidget.lua
@@ -381,7 +381,6 @@ function NaturalLightWidget:onCloseWidget()
     end)
     -- Tell frontlight widget that we're closed
     self.fl_widget:naturalLightConfigClose()
-    return true
 end
 
 function NaturalLightWidget:onShow()
diff --git a/frontend/ui/widget/notification.lua b/frontend/ui/widget/notification.lua
index c4c9ceccf..13b815b6f 100644
--- a/frontend/ui/widget/notification.lua
+++ b/frontend/ui/widget/notification.lua
@@ -182,7 +182,6 @@ function Notification:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.frame.dimen
     end)
-    return true
 end
 
 function Notification:onShow()
diff --git a/frontend/ui/widget/openwithdialog.lua b/frontend/ui/widget/openwithdialog.lua
index 8bb1b377a..cf8acc982 100644
--- a/frontend/ui/widget/openwithdialog.lua
+++ b/frontend/ui/widget/openwithdialog.lua
@@ -188,7 +188,6 @@ function OpenWithDialog:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.dialog_frame.dimen
     end)
-    return true
 end
 
 return OpenWithDialog
diff --git a/frontend/ui/widget/qrmessage.lua b/frontend/ui/widget/qrmessage.lua
index cb39d2d86..684bbb2aa 100644
--- a/frontend/ui/widget/qrmessage.lua
+++ b/frontend/ui/widget/qrmessage.lua
@@ -86,7 +86,6 @@ function QRMessage:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self[1][1].dimen
     end)
-    return true
 end
 
 function QRMessage:onShow()
diff --git a/frontend/ui/widget/screensaverwidget.lua b/frontend/ui/widget/screensaverwidget.lua
index d03f0a70d..2d004241a 100644
--- a/frontend/ui/widget/screensaverwidget.lua
+++ b/frontend/ui/widget/screensaverwidget.lua
@@ -88,7 +88,6 @@ function ScreenSaverWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "full", self.main_frame.dimen
     end)
-    return true
 end
 
 return ScreenSaverWidget
diff --git a/frontend/ui/widget/skimtowidget.lua b/frontend/ui/widget/skimtowidget.lua
index d7ec7fbdb..b6b1bcadb 100644
--- a/frontend/ui/widget/skimtowidget.lua
+++ b/frontend/ui/widget/skimtowidget.lua
@@ -338,7 +338,6 @@ function SkimToWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.skimto_frame.dimen
     end)
-    return true
 end
 
 function SkimToWidget:onShow()
diff --git a/frontend/ui/widget/spinwidget.lua b/frontend/ui/widget/spinwidget.lua
index b83d15477..a2d5b1c52 100644
--- a/frontend/ui/widget/spinwidget.lua
+++ b/frontend/ui/widget/spinwidget.lua
@@ -248,7 +248,6 @@ function SpinWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.spin_frame.dimen
     end)
-    return true
 end
 
 function SpinWidget:onShow()
diff --git a/frontend/ui/widget/textviewer.lua b/frontend/ui/widget/textviewer.lua
index 602c957f2..096e5ac38 100644
--- a/frontend/ui/widget/textviewer.lua
+++ b/frontend/ui/widget/textviewer.lua
@@ -229,7 +229,6 @@ function TextViewer:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "partial", self.frame.dimen
     end)
-    return true
 end
 
 function TextViewer:onShow()
diff --git a/frontend/ui/widget/timewidget.lua b/frontend/ui/widget/timewidget.lua
index 63bd95aac..a3bf01a02 100644
--- a/frontend/ui/widget/timewidget.lua
+++ b/frontend/ui/widget/timewidget.lua
@@ -195,7 +195,6 @@ function TimeWidget:onCloseWidget()
     UIManager:setDirty(nil, function()
         return "ui", self.time_frame.dimen
     end)
-    return true
 end
 
 function TimeWidget:onShow()
diff --git a/frontend/ui/widget/trapwidget.lua b/frontend/ui/widget/trapwidget.lua
index 7dba76521..b33d14b98 100644
--- a/frontend/ui/widget/trapwidget.lua
+++ b/frontend/ui/widget/trapwidget.lua
@@ -155,7 +155,6 @@ function TrapWidget:onCloseWidget()
             return "ui", self.frame.dimen
         end)
     end
-    return true
 end
 
 return TrapWidget
diff --git a/frontend/ui/widget/virtualkeyboard.lua b/frontend/ui/widget/virtualkeyboard.lua
index 519a30c7d..5dd2c56db 100644
--- a/frontend/ui/widget/virtualkeyboard.lua
+++ b/frontend/ui/widget/virtualkeyboard.lua
@@ -771,7 +771,6 @@ end
 
 function VirtualKeyboard:onCloseWidget()
     self:_refresh(false)
-    return true
 end
 
 function VirtualKeyboard:initLayer(layer)