diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
index 1f1896d994b..7a42b0b91ec 100644
--- a/tools/cli/cloudmonkey/cloudmonkey.py
+++ b/tools/cli/cloudmonkey/cloudmonkey.py
@@ -292,7 +292,8 @@ class CloudStackShell(cmd.Cmd):
             autocompletions = self.cache_verbs[verb].keys()
             search_string = subject
         else:                  # Complete subject params
-            autocompletions = self.cache_verbs[verb][subject][1]
+            autocompletions = map(lambda x: x + "=",
+                                  self.cache_verbs[verb][subject][1])
             search_string = text
 
         return [s for s in autocompletions if s.startswith(search_string)]