diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index 339ea15b3..94240600d 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -99,7 +99,7 @@ func newRootCmd(actionConfig *action.Configuration, out io.Writer, args []string
 		Short:                  "The Helm package manager for Kubernetes.",
 		Long:                   globalUsage,
 		SilenceUsage:           true,
-		BashCompletionFunction: completion.GetBashCustomFunction(),
+		BashCompletionFunction: fmt.Sprintf("%s%s", contextCompFunc, completion.GetBashCustomFunction()),
 	}
 	flags := cmd.PersistentFlags()