diff --git a/frontend/ui/widget/screensaverwidget.lua b/frontend/ui/widget/screensaverwidget.lua
index 408770764..422b8fbf8 100644
--- a/frontend/ui/widget/screensaverwidget.lua
+++ b/frontend/ui/widget/screensaverwidget.lua
@@ -19,7 +19,7 @@ local ScreenSaverWidget = InputContainer:extend{
 function ScreenSaverWidget:init()
     if Device:hasKeys() then
         self.key_events = {
-            Close = { {Device.input.group.Back}, doc = "close widget" },
+            AnyKeyPressed = { { Device.input.group.Any }, seqtext = "any key", doc = "close widget" },
         }
     end
     if Device:isTouchDevice() then
@@ -112,11 +112,6 @@ function ScreenSaverWidget:showWaitForGestureMessage(msg)
     infomsg:free()
 end
 
-function ScreenSaverWidget:onExitScreensaver()
-    self:onClose()
-    return true
-end
-
 function ScreenSaverWidget:update()
     self.height = Screen:getHeight()
     self.width = Screen:getWidth()
@@ -167,11 +162,8 @@ function ScreenSaverWidget:onClose()
     UIManager:close(self)
     return true
 end
-
-function ScreenSaverWidget:onAnyKeyPressed()
-    self:onClose()
-    return true
-end
+ScreenSaverWidget.onAnyKeyPressed = ScreenSaverWidget.onClose
+ScreenSaverWidget.onExitScreensaver = ScreenSaverWidget.onClose
 
 function ScreenSaverWidget:onCloseWidget()
     -- Restore to previous rotation mode, if need be.