Fix for modality problem introduced by overlay container #9220

Change-Id: If7056c992dc9096870419d8db18751b2ea80eabf

diff --git a/client/src/com/vaadin/client/ui/window/VWindow.java b/client/src/com/vaadin/client/ui/window/VWindow.java
index e7bfd4dbdb1e9863810bc3cb0bb4bda3160c1e3e..056de6d018bfce74f625470742a1b7ddd6cfeac5 100644 (file)
--- 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() {