diff --git a/Assets/settings-default.json b/Assets/settings-default.json
index 95fcda22f..7a5658aac 100644
--- a/Assets/settings-default.json
+++ b/Assets/settings-default.json
@@ -409,11 +409,6 @@
         "action": "rebootToUefi",
         "enabled": true,
         "keybind": "7"
-      },
-      {
-        "action": "userspace-reboot",
-        "enabled": false,
-        "keybind": "8"
       }
     ]
   },
diff --git a/Modules/LockScreen/LockScreenPanel.qml b/Modules/LockScreen/LockScreenPanel.qml
index 20326b1d3..bb996be7e 100644
--- a/Modules/LockScreen/LockScreenPanel.qml
+++ b/Modules/LockScreen/LockScreenPanel.qml
@@ -88,7 +88,7 @@ Item {
     case "reboot":
       CompositorService.reboot();
       break;
-    case "userspace-reboot":
+    case "userspaceReboot":
       CompositorService.userspaceReboot();
       break;
     case "shutdown":
diff --git a/Modules/Panels/Launcher/Providers/SessionProvider.qml b/Modules/Panels/Launcher/Providers/SessionProvider.qml
index 04b7bcf8f..4ba299447 100644
--- a/Modules/Panels/Launcher/Providers/SessionProvider.qml
+++ b/Modules/Panels/Launcher/Providers/SessionProvider.qml
@@ -41,7 +41,13 @@ Item {
       "keywords": ["reboot", "restart", "reload"]
     },
     {
-      "action": "userspace-reboot",
+      "action": "rebootToUefi",
+      "labelKey": "common.reboot-to-uefi",
+      "icon": iconMode === "tabler" ? "reboot" : "system-reboot",
+      "keywords": ["reboot", "uefi", "firmware", "bios"]
+    },
+    {
+      "action": "userspaceReboot",
       "labelKey": "common.userspace-reboot",
       "icon": iconMode === "tabler" ? "rotate" : "system-reboot",
       "keywords": ["reboot", "restart", "soft", "userspace"]
@@ -174,7 +180,10 @@ Item {
     case "reboot":
       CompositorService.reboot();
       break;
-    case "userspace-reboot":
+    case "rebootToUefi":
+      CompositorService.rebootToUefi();
+      break;
+    case "userspaceReboot":
       CompositorService.userspaceReboot();
       break;
     case "logout":
diff --git a/Modules/Panels/SessionMenu/SessionMenu.qml b/Modules/Panels/SessionMenu/SessionMenu.qml
index 24a6bf88e..7d508ad03 100644
--- a/Modules/Panels/SessionMenu/SessionMenu.qml
+++ b/Modules/Panels/SessionMenu/SessionMenu.qml
@@ -106,6 +106,11 @@ SmartPanel {
       "title": I18n.tr("common.reboot"),
       "isShutdown": false
     },
+    "userspaceReboot": {
+      "icon": "rotate",
+      "title": I18n.tr("common.userspace-reboot"),
+      "isShutdown": false
+    },
     "rebootToUefi": {
       "icon": "reboot",
       "title": I18n.tr("common.reboot-to-uefi"),
@@ -120,11 +125,6 @@ SmartPanel {
       "icon": "shutdown",
       "title": I18n.tr("common.shutdown"),
       "isShutdown": true
-    },
-    "userspace-reboot": {
-      "icon": "rotate",
-      "title": I18n.tr("common.userspace-reboot"),
-      "isShutdown": false
     }
   }
 
@@ -248,7 +248,7 @@ SmartPanel {
     case "reboot":
       CompositorService.reboot();
       break;
-    case "userspace-reboot":
+    case "userspaceReboot":
       CompositorService.userspaceReboot();
       break;
     case "rebootToUefi":
diff --git a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
index cd1738f29..a6ce4ec89 100644
--- a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
+++ b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuEntrySettingsDialog.qml
@@ -25,7 +25,7 @@ Popup {
     "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",
-    "userspace-reboot": "systemctl soft-reboot"
+    "userspaceReboot": "systemctl soft-reboot"
   }
 
   readonly property string defaultCommand: defaultCommands[entryId] || ""
diff --git a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuTab.qml b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuTab.qml
index 74a3d0d94..cfa13e055 100644
--- a/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuTab.qml
+++ b/Modules/Panels/Settings/Tabs/SessionMenu/SessionMenuTab.qml
@@ -38,7 +38,7 @@ ColumnLayout {
       "required": false
     },
     {
-      "id": "userspace-reboot",
+      "id": "userspaceReboot",
       "text": I18n.tr("common.userspace-reboot"),
       "enabled": false,
       "required": false
diff --git a/Services/Compositor/CompositorService.qml b/Services/Compositor/CompositorService.qml
index 913c5a2fd..eaff86edc 100644
--- a/Services/Compositor/CompositorService.qml
+++ b/Services/Compositor/CompositorService.qml
@@ -497,10 +497,10 @@ Singleton {
 
   function userspaceReboot() {
     Logger.i("Compositor", "Userspace reboot requested");
-    if (executeSessionAction("userspace-reboot"))
+    if (executeSessionAction("userspaceReboot"))
       return;
 
-    HooksService.executeSessionHook("userspace-reboot", () => {
+    HooksService.executeSessionHook("userspaceReboot", () => {
                                       Quickshell.execDetached(["sh", "-c", "systemctl soft-reboot"]);
                                     });
   }