diff --git a/src/xpra/client/gtk_base/gtk_client_window_base.py b/src/xpra/client/gtk_base/gtk_client_window_base.py
index a11dbb0ee9..8e47e4b66a 100644
--- a/src/xpra/client/gtk_base/gtk_client_window_base.py
+++ b/src/xpra/client/gtk_base/gtk_client_window_base.py
@@ -1710,7 +1710,10 @@ def process_map_event(self):
             #we may have cleared the backing, so we must re-create one:
             self._set_backing_size(w, h)
         if not self._override_redirect:
-            self.idle_add(self._focus_change, "initial")
+            htf = self.has_toplevel_focus()
+            focuslog("mapped: has-toplevel-focus=%s", htf)
+            if htf:
+                self._client.update_focus(self._id, htf)
 
     def get_window_frame_size(self):
         frame = self._client.get_frame_extents(self)