diff --git a/shell/completion.bash b/shell/completion.bash
index afe19c25..7e46bacf 100644
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -503,9 +503,9 @@ if ! declare -F __fzf_list_hosts > /dev/null; then
       ) \
       <(
         __fzf_exec_awk -F ',' '
-          match($0, /^[[a-zA-Z0-9.,:-]+/) {
+          match($0, /^[][a-zA-Z0-9.,:-]+/) {
             $0 = substr($0, 1, RLENGTH)
-            gsub(/\[/, "")
+            gsub(/[][]|:[^,]*/, "")
             for (i = 1; i <= NF; i++)
               print $i
           }
diff --git a/shell/completion.zsh b/shell/completion.zsh
index b17271c5..3663a610 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -281,9 +281,9 @@ if ! declare -f __fzf_list_hosts > /dev/null; then
       ) \
       <(
         __fzf_exec_awk -F ',' '
-          match($0, /^[[a-zA-Z0-9.,:-]+/) {
+          match($0, /^[][a-zA-Z0-9.,:-]+/) {
             $0 = substr($0, 1, RLENGTH)
-            gsub(/\[/, "")
+            gsub(/[][]|:[^,]*/, "")
             for (i = 1; i <= NF; i++)
               print $i
           }