1 files changed, 8 insertions(+), 2 deletions(-)

M dwl.c

@@ 1461,7 1461,10 @@ focusortogglematchingscratch(const Arg *arg)
 				}
 			} else {
 				// show
-				c->tags = selmon->tagset[selmon->seltags];
+        if (c->mon == selmon)
+          c->tags = selmon->tagset[selmon->seltags];
+        else
+          setmon(c, selmon, 0);
 				// focus
 				focusclient(c, 1);
 			}


@@ 1506,7 1509,10 @@ focusortogglescratch(const Arg *arg)
 			}
 		} else {
 			// show
-			c->tags = selmon->tagset[selmon->seltags];
+      if (c->mon == selmon)
+        c->tags = selmon->tagset[selmon->seltags];
+      else
+        setmon(c, selmon, 0);
 			focusclient(c, 1);
 		}
 		arrange(selmon);