diff --git a/hm/brightness/default.nix b/hm/brightness/default.nix
index cf6fbd0..3ae518f 100644
--- a/hm/brightness/default.nix
+++ b/hm/brightness/default.nix
@@ -34,10 +34,15 @@ in
           if [ -x "$switch" ]
           then
               sudo "$switch" test &
-              sudo "$switch" boot &
           fi
           ${builtins.getAttr phase.command config.frogeye.desktop.phasesCommands}
           wait
+          # Boot does not have to be set immediately and can result to lock issues with test,
+          # so it is run at the end
+          if [ -x "$switch" ]
+          then
+              sudo "$switch" boot
+          fi
         '')
       ) phases)
       ++ (with pkgs; [