diff --git a/retroarch.c b/retroarch.c
index 18ba465cf8..6773ccf923 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4727,8 +4727,12 @@ bool command_event(enum event_command cmd, void *data)
             runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_SHUTTING_DOWN), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
          }
+#ifdef HAVE_LAKKA
+         system("(sleep 1 && shutdown -P now) & disown");
+#else
          command_event(CMD_EVENT_QUIT, NULL);
          system("shutdown -P now");
+#endif /* HAVE_LAKKA */
 #endif
          break;
       case CMD_EVENT_REBOOT:
@@ -4738,8 +4742,12 @@ bool command_event(enum event_command cmd, void *data)
             runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_REBOOTING), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
          }
+#ifdef HAVE_LAKKA
+         system("(sleep 1 && shutdown -r now) & disown");
+#else
          command_event(CMD_EVENT_QUIT, NULL);
          system("shutdown -r now");
+#endif /* HAVE_LAKKA */
 #endif
          break;
       case CMD_EVENT_RESUME: