diff --git a/src/root-manager.scm b/src/root-manager.scm
index 4a3db39..860aca1 100644
--- a/src/root-manager.scm
+++ b/src/root-manager.scm
@@ -118,6 +118,7 @@
   (sync-point-wait (root-wm:finish root-wm)))
 
 (define (root-wm-manage-window root-wm window)
+  (set-wm-state! (root-wm:dpy root-wm) window (wm-state normal) none)
   (wm-manage-window (root-wm:current-manager root-wm) window))
 
 (define (handle-xevent root-wm exit xevent)
@@ -129,9 +130,7 @@
       (configure-window dpy (configure-request-event-window xevent)
                         (configure-request-event-window-change-alist xevent)))
      ((map-request-event? xevent)
-      (wm-manage-window (root-wm:current-manager root-wm)
-			(map-request-event-window xevent)
-			#f))
+      (root-wm-manage-window root-wm (map-request-event-window xevent)))
      ((and (unmap-event? xevent) (not (unmap-event-from-configure? xevent)))
       ;; syntetic unmap event for a transition to withdrawn state
       (set-wm-state! dpy (unmap-event-window xevent)