diff --git a/pkgs/clan-cli/clan_cli/errors.py b/pkgs/clan-cli/clan_cli/errors.py
index 0315ce75f..7b1308079 100644
--- a/pkgs/clan-cli/clan_cli/errors.py
+++ b/pkgs/clan-cli/clan_cli/errors.py
@@ -74,7 +74,7 @@ def indent_command(command_list: list[str]) -> str:
                 # Indent after the next argument
                 formatted_command.append(" ")
                 i += 1
-                formatted_command.append(command_list[i])
+                formatted_command.append(shlex.quote(command_list[i]))
 
         if i < len(command_list) - 1:
             # Add line continuation only if it's not the last argument
diff --git a/pkgs/distro-packages/gui-installer/gui-installer.sh b/pkgs/distro-packages/gui-installer/gui-installer.sh
index c222b1431..bc7f73d91 100755
--- a/pkgs/distro-packages/gui-installer/gui-installer.sh
+++ b/pkgs/distro-packages/gui-installer/gui-installer.sh
@@ -55,7 +55,7 @@ start_clan_gui() {
     exec nix run \
       https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-app \
       --no-accept-flake-config \
-      --extra-experimental-features flakes nix-command -- "$@"
+      --extra-experimental-features "flakes nix-command" -- "$@"
 }
 
 main() {