diff --git a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
index 8d53c4fef..0c5422678 100644
--- a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
+++ b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
@@ -22,7 +22,7 @@ Popup {
     "suspend": "systemctl suspend || loginctl suspend",
     "hibernate": "systemctl hibernate || loginctl hibernate",
     "reboot": "systemctl reboot || loginctl reboot",
-    "rebootToUefi": "systemctl reboot --firmware-setup",
+    "rebootToUefi": "systemctl reboot --firmware-setup || loginctl reboot --firmware-setup",
     "logout": I18n.tr("panels.session-menu.entry-settings-default-command-logout"),
     "shutdown": "systemctl poweroff || loginctl poweroff"
   }
diff --git a/Services/Compositor/CompositorService.qml b/Services/Compositor/CompositorService.qml
index 441d58aa5..2d5e5dfe3 100644
--- a/Services/Compositor/CompositorService.qml
+++ b/Services/Compositor/CompositorService.qml
@@ -494,7 +494,7 @@ Singleton {
       return;
 
     HooksService.executeSessionHook("rebootToUefi", () => {
-                                      Quickshell.execDetached(["sh", "-c", "systemctl reboot --firmware-setup"]);
+                                      Quickshell.execDetached(["sh", "-c", "systemctl reboot --firmware-setup || loginctl reboot --firmware-setup"]);
                                     });
   }