diff --git a/session/session_setup.go b/session/session_setup.go
index 80b3963b..0c0ec266 100644
--- a/session/session_setup.go
+++ b/session/session_setup.go
@@ -50,6 +50,15 @@ func (s *Session) setupReadline() (err error) {
 		}
 	}
 
+	for root, subElems := range tree {
+		item := readline.PcItem(root)
+		item.Children = []readline.PrefixCompleterInterface{}
+		for _, child := range subElems {
+			item.Children = append(item.Children, readline.PcItem(child))
+		}
+		prefixCompleters = append(prefixCompleters, item)
+	}
+
 	history := ""
 	if !*s.Options.NoHistory {
 		history, _ = core.ExpandPath(HistoryFile)