diff --git a/dwl.c b/dwl.c
index 101a45f..8f91363 100644
--- a/dwl.c
+++ b/dwl.c
@@ -2697,7 +2697,11 @@ tag(const Arg *arg)
 	if (!sel || (arg->ui & TAGMASK) == 0)
 		return;
 
-	sel->tags = arg->ui & TAGMASK;
+	if ((arg->ui & TAGMASK) == TAGMASK && sel->tags == TAGMASK)
+		sel->tags = selmon->tagset[selmon->seltags];
+	else
+		sel->tags = arg->ui & TAGMASK;
+
 	focusclient(focustop(selmon), 1);
 	arrange(selmon);
 	printstatus();