diff --git a/patch/shiftviewclients.c b/patch/shiftviewclients.c
index fb0da48..04378ef 100644
--- a/patch/shiftviewclients.c
+++ b/patch/shiftviewclients.c
@@ -25,11 +25,17 @@ shiftviewclients(const Arg *arg)
 		do {
 			shifted.ui = (shifted.ui << arg->i)
 			   | (shifted.ui >> (NUMTAGS - arg->i));
+			#if SCRATCHPADS_PATCH
+			shifted.ui &= ~SPTAGMASK;
+			#endif // SCRATCHPADS_PATCH
 		} while (tagmask && !(shifted.ui & tagmask));
 	else // right circular shift
 		do {
 			shifted.ui = (shifted.ui >> (- arg->i)
 			   | shifted.ui << (NUMTAGS + arg->i));
+			#if SCRATCHPADS_PATCH
+			shifted.ui &= ~SPTAGMASK;
+			#endif // SCRATCHPADS_PATCH
 		} while (tagmask && !(shifted.ui & tagmask));
 
 	view(&shifted);