diff --git a/src/nimwin.nim b/src/nimwin.nim
index aabb70f..17c0fe1 100644
--- a/src/nimwin.nim
+++ b/src/nimwin.nim
@@ -615,8 +615,8 @@ when isMainModule:
           windowZipper.rhs = windowStack.reversed
           windowZipper.lhs = @[]
 
-      if currentFocus.isSome:
-        var focus = currentFocus.get
+      if windowZipper.zipperFocus.isSome:
+        var focus = windowZipper.zipperFocus.get
         display.setActiveWindow(root, focus.addr)
         echo display.getActiveWindowName(root)
 
@@ -637,6 +637,8 @@ when isMainModule:
 
           discard display.XSetInputFocus(ev.xmap.window, RevertToPointerRoot, CurrentTime)
 
+          display.setActiveWindow(root, ev.xmap.window.addr)
+
           # Listen for FocusChange (FocusIn/FocusOut) events on the window
           display.changeEvMask(ev.xmap.window.addr, FocusChangeMask)