diff --git a/dwl.c b/dwl.c
index f981c7c..6094ff2 100644
--- a/dwl.c
+++ b/dwl.c
@@ -2964,9 +2964,9 @@ shiftview(const Arg *arg)
 	Arg a;
 	unsigned int tagmask = selmon->tagset[selmon->seltags];
 	if (arg->i > 0)
-		a.ui = (tagmask == (1u << (TAGCOUNT - 1))) ? 1 : tagmask << 1;
+		a.ui = (tagmask == (1u << (LENGTH(tags) - 1))) ? 1 : tagmask << 1;
 	else
-		a.ui = (tagmask == 1) ? (1u << (TAGCOUNT - 1)) : tagmask >> 1;
+		a.ui = (tagmask == 1) ? (1u << (LENGTH(tags) - 1)) : tagmask >> 1;
 	view(&a);
 }
 
@@ -2979,9 +2979,9 @@ shiftclient(const Arg *arg)
 	if (!sel)
 		return;
 	if (arg->i > 0)
-		a.ui = (tagmask == (1u << (TAGCOUNT - 1))) ? 1 : tagmask << 1;
+		a.ui = (tagmask == (1u << (LENGTH(tags) - 1))) ? 1 : tagmask << 1;
 	else
-		a.ui = (tagmask == 1) ? (1u << (TAGCOUNT - 1)) : tagmask >> 1;
+		a.ui = (tagmask == 1) ? (1u << (LENGTH(tags) - 1)) : tagmask >> 1;
 	sel->tags = a.ui;
 	view(&a);
 }
@@ -3397,10 +3397,9 @@ void
 movestack(const Arg *arg)
 {
 	Client *c, *sel = focustop(selmon);
+	int wrap = 0;
 	if (!sel || !selmon || !selmon->lt[selmon->sellt]->arrange || sel->isfloating)
 		return;
-
-	int wrap = 0;
 	if (arg->i > 0) {
 		wl_list_for_each(c, &sel->link, link) {
 			if (&c->link == &clients) {