diff --git a/tools/vsh.c b/tools/vsh.c
index 9b994559ee..7e3c6456ae 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2765,10 +2765,7 @@ vshReadlineParse(const char *text, int state)
         if (!cmd) {
             list = vshReadlineCommandGenerator(text);
         } else {
-            if (!opt || (opt->type != VSH_OT_DATA &&
-                         opt->type != VSH_OT_STRING &&
-                         opt->type != VSH_OT_INT &&
-                         opt->type != VSH_OT_ARGV))
+            if (!opt || opt->type == VSH_OT_BOOL)
                 list = vshReadlineOptionsGenerator(text, cmd, partial);
 
             if (opt && opt->completer) {