From c2c87b406c94fdac9d17ff88336e3cc8838bd839 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 15 Dec 2010 12:12:59 +0000
Subject: [PATCH] fixes #6161

svn changeset:16515/svn branch:6.5
---
 src/com/vaadin/terminal/gwt/client/ui/VWindow.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 6bf8052880..9691acc31c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -730,7 +730,12 @@ public class VWindow extends VOverlay implements Container, ScrollListener,
         }
         DOM.setStyleAttribute(modalityCurtain, "zIndex",
                 "" + (windowOrder.indexOf(this) + Z_INDEX));
-        DOM.appendChild(RootPanel.getBodyElement(), modalityCurtain);
+        if (isShowing()) {
+            RootPanel.getBodyElement().insertBefore(modalityCurtain,
+                    getElement());
+        } else {
+            DOM.appendChild(RootPanel.getBodyElement(), modalityCurtain);
+        }
     }
 
     private void hideModalityCurtain() {
-- 
2.39.5