From 8cf6a76827818f7fa32a3d0981f45d10cc0db2db Mon Sep 17 00:00:00 2001
From: Marc Englund <marc@vaadin.com>
Date: Wed, 31 Oct 2012 11:51:22 +0200
Subject: [PATCH] Fix for modality problem introduced by overlay container
 #9220

Change-Id: If7056c992dc9096870419d8db18751b2ea80eabf
---
 client/src/com/vaadin/client/ui/window/VWindow.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/src/com/vaadin/client/ui/window/VWindow.java b/client/src/com/vaadin/client/ui/window/VWindow.java
index e7bfd4dbdb..056de6d018 100644
--- a/client/src/com/vaadin/client/ui/window/VWindow.java
+++ b/client/src/com/vaadin/client/ui/window/VWindow.java
@@ -432,7 +432,14 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
     private void showModalityCurtain() {
         DOM.setStyleAttribute(getModalityCurtain(), "zIndex",
                 "" + (windowOrder.indexOf(this) + Z_INDEX));
-        getOverlayContainer().appendChild(getModalityCurtain());
+
+        if (isShowing()) {
+            getOverlayContainer().insertBefore(getModalityCurtain(),
+                    getElement());
+        } else {
+            getOverlayContainer().appendChild(getModalityCurtain());
+        }
+
     }
 
     private void hideModalityCurtain() {
-- 
2.39.5