diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 27f10f1c6..4cdb1383c 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -173,6 +173,8 @@ static void cli_txt_list_del_word(struct dl_list *txt_list, const char *txt)
 	const char *end;
 	char *buf;
 	end = os_strchr(txt, ' ');
+	if (end == NULL)
+		end = os_strchr(txt, '\t');
 	if (end == NULL)
 		end = txt + os_strlen(txt);
 	buf = dup_binstr(txt, end - txt);
@@ -221,6 +223,8 @@ static int cli_txt_list_add_word(struct dl_list *txt_list, const char *txt)
 	char *buf;
 	int ret;
 	end = os_strchr(txt, ' ');
+	if (end == NULL)
+		end = os_strchr(txt, '\t');
 	if (end == NULL)
 		end = txt + os_strlen(txt);
 	buf = dup_binstr(txt, end - txt);