diff --git a/dmenu.c b/dmenu.c
index 6ccd03e..7dbb63d 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -616,12 +616,10 @@ insert:
 		}
 		break;
 	case XK_Tab:
-		if (!sel)
-			return;
-		cursor = strnlen(sel->text, sizeof text - 1);
-		memcpy(text, sel->text, cursor);
-		text[cursor] = '\0';
-		match();
+		if (sel && sel->right && (sel = sel->right) == next) {
+			curr = next;
+			calcoffsets();
+		}
 		break;
 	}