1 files changed, 3 insertions, 1 deletions

diff --git a/src/WinClient.cc b/src/WinClient.cc
index ed6fe25..450a041 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -174,7 +174,8 @@ bool WinClient::acceptsFocus() const {
 
 bool WinClient::sendFocus() {
     if (accepts_input) {
-        setInputFocus(RevertToParent, CurrentTime);
+        setInputFocus(RevertToPointerRoot, CurrentTime);
+        FocusControl::setExpectingFocus(this);
         return true;
     }
     if (!send_focus_message)
@@ -198,6 +199,7 @@ bool WinClient::sendFocus() {
     ce.xclient.data.l[4] = 0l;
     // send focus msg
     XSendEvent(display(), window(), false, NoEventMask, &ce);
+    FocusControl::setExpectingFocus(this);
     return true;
 }