diff --git a/speedwm.c b/speedwm.c
index 1f603c7..37bf844 100644
--- a/speedwm.c
+++ b/speedwm.c
@@ -1168,10 +1168,6 @@ arrange(Monitor *m)
 		restack(m);
 	} else for (m = mons; m; m = m->next)
 		arrangemon(m);
-
-    #if USETAGPREVIEW
-    takepreview();
-    #endif
 }
 
 void
@@ -6108,6 +6104,9 @@ view(const Arg *arg)
 
 	if(arg->ui && (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
 		return;
+    #if USETAGPREVIEW
+    takepreview();
+    #endif
 	for (m = mons; m; m = m->next)
 		m->seltags ^= 1;
 	if (arg->ui & TAGMASK) {
@@ -6144,9 +6143,6 @@ view(const Arg *arg)
 		togglebar(NULL);
     }
 
-    #if USETAGPREVIEW
-    takepreview();
-    #endif
 	focus(NULL);
 	arrange(NULL);
 	updatecurrentdesktop();