diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
index 3c83f633aec8..0f2b1633acb5 100644
--- a/contrib/completions/bash/oc
+++ b/contrib/completions/bash/oc
@@ -282,7 +282,7 @@ __custom_func() {
             ;;
 
         # first arg is a pod name
-        oc_rsh)
+        oc_rsh | oc_exec)
             if [[ ${#nouns[@]} -eq 0 ]]; then
                 __oc_parse_get pods
             fi;
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
index 131d0478f014..e50c1390582c 100644
--- a/contrib/completions/zsh/oc
+++ b/contrib/completions/zsh/oc
@@ -443,7 +443,7 @@ __custom_func() {
             ;;
 
         # first arg is a pod name
-        oc_rsh)
+        oc_rsh | oc_exec)
             if [[ ${#nouns[@]} -eq 0 ]]; then
                 __oc_parse_get pods
             fi;
diff --git a/pkg/cmd/cli/cli_bashcomp_func.go b/pkg/cmd/cli/cli_bashcomp_func.go
index e22418d8040f..607a5ea250a6 100644
--- a/pkg/cmd/cli/cli_bashcomp_func.go
+++ b/pkg/cmd/cli/cli_bashcomp_func.go
@@ -60,7 +60,7 @@ __custom_func() {
             ;;
 
         # first arg is a pod name
-        oc_rsh)
+        oc_rsh | oc_exec)
             if [[ ${#nouns[@]} -eq 0 ]]; then
                 __oc_parse_get pods
             fi;