diff --git a/cccli/cli.py b/cccli/cli.py
index 54639fad6d1444b00990ac44e82d1db5e8c84eac..6290d2843f5101e39afa163cda8a5cede076c0f1 100644
--- a/cccli/cli.py
+++ b/cccli/cli.py
@@ -161,7 +161,7 @@ class Cli(object):
         stripped = comp.get_buf()[:comp.get_begin() + 1].lstrip()
         if texte == "" and stripped != "":
             return None
-        return [ c for c in  Command.list() if c.startswith(texte) ]
+        return [ c for c in  Command.list() + self.alias.keys() if c.startswith(texte) ]
 
 class CliHandler(RpcHandler):
     '''Handle RPC incoming request'''