2 files changed, 3 insertions, 12 deletions

diff --git a/default_device.cpp b/default_device.cpp
index 648eaec4e..1f181318e 100644
--- a/default_device.cpp
+++ b/default_device.cpp
@@ -31,20 +31,10 @@ static const char* ITEMS[] =  {"reboot system now",
                                "wipe cache partition",
                                NULL };
 
-class DefaultUI : public ScreenRecoveryUI {
-  public:
-    virtual KeyAction CheckKey(int key) {
-        if (key == KEY_HOME) {
-            return TOGGLE;
-        }
-        return ENQUEUE;
-    }
-};
-
 class DefaultDevice : public Device {
   public:
     DefaultDevice() :
-        ui(new DefaultUI) {
+        ui(new ScreenRecoveryUI) {
     }
 
     RecoveryUI* GetUI() { return ui; }
@@ -61,6 +51,7 @@ class DefaultDevice : public Device {
                 return kHighlightUp;
 
               case KEY_ENTER:
+              case KEY_POWER:
                 return kInvokeItem;
             }
         }
diff --git a/ui.cpp b/ui.cpp
index 67a2500bb..091012f29 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -276,7 +276,7 @@ void RecoveryUI::FlushKeys() {
 // - Press power seven times in a row to reboot.
 // - Alternate vol-up and vol-down seven times to mount /system.
 RecoveryUI::KeyAction RecoveryUI::CheckKey(int key) {
-    if (IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) {
+    if ((IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) || key == KEY_HOME) {
         return TOGGLE;
     }