diff --git a/tools/tui/readline/completion.go b/tools/tui/readline/completion.go
index 3287a22ec..6feabb609 100644
--- a/tools/tui/readline/completion.go
+++ b/tools/tui/readline/completion.go
@@ -47,7 +47,7 @@ func (self *completion) current_match_text() string {
 			for _, m := range g.Matches {
 				if i == self.current_match {
 					t := m.Word
-					if !g.NoTrailingSpace {
+					if !g.NoTrailingSpace && t != "" {
 						t += " "
 					}
 					return t