diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 0099e18e9..d14b23dce 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -151,8 +151,8 @@ function omz_termsupport_cwd {
   local cache_key="$HOST:$PWD:${KONSOLE_PROFILE_NAME:+1}:${KONSOLE_DBUS_SESSION:+1}"
   if [[ "$_omz_termsupport_cwd_key" != "$cache_key" ]]; then
     local URL_HOST URL_PATH
-    URL_HOST="$(omz_urlencode -P $HOST)" || return 1
-    URL_PATH="$(omz_urlencode -P $PWD)" || return 1
+    URL_HOST="$(omz_urlencode -P "$HOST")" || return 1
+    URL_PATH="$(omz_urlencode -P "$PWD")" || return 1
 
     # Konsole errors if the HOST is provided
     [[ -z "$KONSOLE_PROFILE_NAME" && -z "$KONSOLE_DBUS_SESSION"  ]] || URL_HOST=""