diff --git a/fvwm/windowshade.c b/fvwm/windowshade.c
index 8f22db07a..6bcfc3939 100644
--- a/fvwm/windowshade.c
+++ b/fvwm/windowshade.c
@@ -219,7 +219,7 @@ void CMD_WindowShade(F_CMD_ARGS)
 	FlushAllMessageQueues();
 	XFlush(dpy);
 	EWMH_SetWMState(fw, False);
-
+	SetFocusWindow(fw, True, FOCUS_SET_FORCE);
 	return;
 }