diff --git a/modules/services/linux-wallpaperengine.nix b/modules/services/linux-wallpaperengine.nix
index 60a2f9b58..927e316c6 100644
--- a/modules/services/linux-wallpaperengine.nix
+++ b/modules/services/linux-wallpaperengine.nix
@@ -117,7 +117,7 @@ in
         args = lib.lists.forEach cfg.wallpapers (
           each:
           lib.concatStringsSep " " (
-            lib.cli.toGNUCommandLine { } {
+            lib.cli.toCommandLineGNU { } {
               screen-root = each.monitor;
               inherit (each) scaling fps;
               inherit (each.audio) silent;
@@ -125,9 +125,11 @@ in
               no-audio-processing = !each.audio.processing;
             }
             ++ each.extraOptions
+            ++ [
+              "--bg"
+              each.wallpaperId
+            ]
           )
-          # This has to be the last argument in each group
-          + " --bg ${each.wallpaperId}"
         );
       in
       {
diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
index b0827a39d..ea948347e 100644
--- a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
+++ b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --assets-dir /some/path/to/assets --clamping border --fps 6 --scaling fit --screen-root HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root DP-1 --silent --scaling fill --fps 12 --bg 87654321
+ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --assets-dir /some/path/to/assets --clamping border --fps=6 --scaling=fit --screen-root=HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root=DP-1 --silent --scaling fill --fps 12 --bg 87654321
 Restart=on-failure
 
 [Unit]
diff --git a/tests/modules/services/linux-wallpaperengine/missing-spaces-expected.service b/tests/modules/services/linux-wallpaperengine/missing-spaces-expected.service
index e00de9935..fc4e3ade8 100644
--- a/tests/modules/services/linux-wallpaperengine/missing-spaces-expected.service
+++ b/tests/modules/services/linux-wallpaperengine/missing-spaces-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --screen-root HDMI-A-1 --bg 2902931482
+ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --screen-root=HDMI-A-1 --bg 2902931482
 Restart=on-failure
 
 [Unit]