diff --git a/cmd/helm/completion.go b/cmd/helm/completion.go
index b1678453c..07c882516 100644
--- a/cmd/helm/completion.go
+++ b/cmd/helm/completion.go
@@ -304,7 +304,13 @@ end
 function __helm_get_completions
     # Use the cache if possible
     if not set -q __helm_cache_completions
-       set -g __helm_cache_completions (__helm_perform_completion (commandline))
+       if not set -q __helm_comp_command_line
+	      set -g __helm_comp_command_line (commandline)
+	      __helm_debug "Setting commandline to: $__helm_comp_command_line"
+	   end
+
+       set -g __helm_cache_completions (__helm_perform_completion "$__helm_comp_command_line")
+       set -e __helm_comp_command_line
        __helm_debug "Populated completion cache with: $__helm_cache_completions"
     end