1 files changed, 3 insertions, 0 deletions
diff --git a/src/sxwm.c b/src/sxwm.c
index 8aa7bd8..b1ce613 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -2494,6 +2494,9 @@ void toggle_scratchpad(int n)
 	if (scratchpads[n].enabled) {
 		XUnmapWindow(dpy, scratchpads[n].client->win);
 		scratchpads[n].enabled = False;
+		focus_prev();
+		send_wm_take_focus(focused->win);
+		update_borders();
 	}
 	else {
 		XMapWindow(dpy, scratchpads[n].client->win);