1 files changed, 9 insertions, 2 deletions

diff --git a/dwl.c b/dwl.c
index 38de151..5f15ced 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1869,8 +1869,16 @@ focusclient(Client *c, int lift)
 	if (c && lift)
 		wlr_scene_node_raise_to_top(&c->scene->node);
 
-	if (c && client_surface(c) == old)
+	if (c && client_surface(c) == old && !seat->drag) {
+		focused_tag = selmon->tagset[selmon->seltags];
+		for (i = 0; i < LENGTH(tags); i++) {
+			if (focused_tag & (1 << (i - 1))) {
+				break;
+			}
+		}
+		client_set_border_color(c, (float[])COLOR(tagsel[i - 1][0]));
 		return;
+	}
 
 	if ((old_client_type = toplevel_from_wlr_surface(old, &old_c, &old_l)) == XDGShell) {
 		struct wlr_xdg_popup *popup, *tmp;
@@ -3935,7 +3943,6 @@ winview(const Arg *a) {
 		return;
 	b.ui = sel -> tags;
 	view(&b);
-	focusclient(sel, 1);
 	return;
 }