diff --git a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
index d7a4ee6..8c91e4a 100644
--- a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
+++ b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
@@ -1,7 +1,7 @@
 name: pimp-my-shell
 repository: .
 version: ""
-install_date: "2024-04-15T11:36:25-03:00"
+install_date: "2024-04-15T23:46:21-03:00"
 project_files:
     - web-build/Dockerfile.pimp-my-shell
     - homeadditions/.bashrc.d/pimp-my-shell.sh
diff --git a/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh b/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh
index a018b27..fe4cff2 100644
--- a/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh
+++ b/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -31,8 +31,8 @@ function set_win_title(){
   # Shortening $PWD
   # /var/www/html -> /v/w/html
   local short_pwd=$(echo "$PWD" | sed 's/\([^\/]\)[^\/]*\//\1\//g')
-  echo -ne "\033]0;$DDEV_PROJECT/ddev: $short_pwd $@\007"
+  echo -ne "\033]0;$@$DDEV_PROJECT/ddev: $short_pwd\007"
 }
 starship_precmd_user_func="set_win_title"
 eval "$(starship init bash)"
-trap "set_win_title - \${BASH_COMMAND}" DEBUG
+trap "set_win_title \"\${BASH_COMMAND} - \"" DEBUG
diff --git a/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish b/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
index 5626383..ff33288 100644
--- a/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
+++ b/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
@@ -21,7 +21,7 @@ end
 function fish_title
   set --local title "$DDEV_PROJECT/ddev: "(fish_prompt_pwd_dir_length=1 prompt_pwd)
   if count $argv > /dev/null
-    set title "$title - $argv"
+    set title "$argv - $title"
   end
   echo $title
 end
diff --git a/homeadditions/.bashrc.d/pimp-my-shell.sh b/homeadditions/.bashrc.d/pimp-my-shell.sh
index a018b27..fe4cff2 100644
--- a/homeadditions/.bashrc.d/pimp-my-shell.sh
+++ b/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -31,8 +31,8 @@ function set_win_title(){
   # Shortening $PWD
   # /var/www/html -> /v/w/html
   local short_pwd=$(echo "$PWD" | sed 's/\([^\/]\)[^\/]*\//\1\//g')
-  echo -ne "\033]0;$DDEV_PROJECT/ddev: $short_pwd $@\007"
+  echo -ne "\033]0;$@$DDEV_PROJECT/ddev: $short_pwd\007"
 }
 starship_precmd_user_func="set_win_title"
 eval "$(starship init bash)"
-trap "set_win_title - \${BASH_COMMAND}" DEBUG
+trap "set_win_title \"\${BASH_COMMAND} - \"" DEBUG
diff --git a/homeadditions/.config/fish/conf.d/pimp-my-shell.fish b/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
index 5626383..ff33288 100644
--- a/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
+++ b/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
@@ -21,7 +21,7 @@ end
 function fish_title
   set --local title "$DDEV_PROJECT/ddev: "(fish_prompt_pwd_dir_length=1 prompt_pwd)
   if count $argv > /dev/null
-    set title "$title - $argv"
+    set title "$argv - $title"
   end
   echo $title
 end