diff --git a/home/modules/hyprland/autostart.nix b/home/modules/hyprland/autostart.nix
index cdf2cb29..c6ef1faf 100644
--- a/home/modules/hyprland/autostart.nix
+++ b/home/modules/hyprland/autostart.nix
@@ -6,6 +6,7 @@
 }:
 builtins.concatLists [
   (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
+  (lib.optionals hyprland.hyprpanel.enable ["hyprpanel"]) # Panel
   [
     # Start clipboard management
     "wl-paste -t text --watch clipman store --no-persist"
@@ -13,7 +14,6 @@ builtins.concatLists [
 
     "hyprctl setcursor ${config.home.pointerCursor.name} ${builtins.toString config.home.pointerCursor.size}"
     "hyprsunset --identity"
-    "hyprpanel"
 
     # HACK: Hyprland doesn't set the xwayland/x11 keymap correctly
     "setxkbmap -layout ${hyprland.keyboard.layout} -variant ${hyprland.keyboard.variant} -option ${hyprland.keyboard.option} -model pc104"
diff --git a/home/modules/hyprland/options.nix b/home/modules/hyprland/options.nix
index fa661a31..b44a7b2b 100644
--- a/home/modules/hyprland/options.nix
+++ b/home/modules/hyprland/options.nix
@@ -10,6 +10,7 @@
   dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
   trails.enable = lib.mkEnableOption "Enable dynamic window trails";
   hyprspace.enable = lib.mkEnableOption "Enable hyprspace workspace overview";
+  hyprpanel.enable = lib.mkEnableOption "Enable hyprpanel";
 
   keyboard = {
     layout = lib.mkOption {