diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 92ff947b8..cd23f8894 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -80,7 +80,8 @@ __helm_list_releases()
 __helm_custom_func()
 {
     case ${last_command} in
-        helm_delete | helm_history | helm_status | helm_test)
+        helm_delete | helm_history | helm_status | helm_test |\
+        helm_upgrade | helm_rollback | helm_get_*)
             __helm_list_releases
             return
             ;;