=== modified file 'src/com/goldencode/p2j/ui/chui/ThinClient.java'
--- src/com/goldencode/p2j/ui/chui/ThinClient.java	2016-01-29 15:50:34 +0000
+++ src/com/goldencode/p2j/ui/chui/ThinClient.java	2016-03-17 22:05:43 +0000
@@ -3087,7 +3087,7 @@
     */
    public synchronized void refreshHover()
    {
-      Window wnd = WindowManager.getActiveWindow();
+      TopLevelWindow wnd = WindowManager.getActiveWindow();
       if (recentlyHovered != null && recentlyHovered.windowId() == wnd.getId().asInt())
       {
          recentlyHovered.updateCursor();
@@ -18989,7 +18989,7 @@
             independentEventDrawingBracket(activeDropDown, activeDropDown.deactivateCode());
          }
          
-         Window wnd = WindowManager.getActiveWindow();
+         TopLevelWindow wnd = WindowManager.getActiveWindow();
          if (wnd != null)
          {
             try

=== modified file 'src/com/goldencode/p2j/ui/client/TopLevelWindow.java'
--- src/com/goldencode/p2j/ui/client/TopLevelWindow.java	2016-03-10 19:49:42 +0000
+++ src/com/goldencode/p2j/ui/client/TopLevelWindow.java	2016-03-17 22:51:19 +0000
@@ -726,64 +726,80 @@
                WindowManager.setActiveWindow(tlw);
             }
          }
-         else if ((oldActive != this && !(oldActive != null && oldActive.isOverlay())) ||
-                  activated.withNativeWindow())
+         else 
          {
-            // the ACTIVE-WINDOW handle is updated before the LEAVE/ENTRY events are sent
-            // if LEAVE event returns NO-APPLY, ENTRY is no longer sent
-            
-            TopLevelWindow<?> owner = getOwner();
-            if (owner != null)
-            {
-               // this is a window connected to an owner, move the owner to top 
-               WindowManager.moveToTop(owner);
-               
-               // and also all the other dialogs owned by the owner, make sure 
-               // the z-order is preserved
-               int oId = owner.getId().asInt();
-               WindowManager.getModalsOwnedBy(oId, true).stream()
-                  .forEach(w -> WindowManager.moveToTop(w));
-               
-               // and finally move us to top
-               WindowManager.moveToTop(this);
-            }
-            else
-            {
-               // this is a main window, move us to top
-               WindowManager.moveToTop(this);
-               
-               // move to top the modal windows owned by this window, preserve z-order 
-               WindowManager.getModalsOwnedBy(getId().asInt(), true).stream()
-                  .forEach(w -> WindowManager.moveToTop(w));
-            }
-            
-            // the active-window handle is set BEFORE executing the LEAVE/ENTRY triggers
-            WindowManager.setActiveWindow(owner != null ? owner : this);
+            boolean oldNotOverlay = !(oldActive != null && oldActive.isOverlay());
+            boolean needRebuildZorder = (oldActive != this && oldNotOverlay) ||
+                                        activated.withNativeWindow();
+            if (needRebuildZorder)
+            {
+               // the ACTIVE-WINDOW handle is updated before the LEAVE/ENTRY events are sent
+               // if LEAVE event returns NO-APPLY, ENTRY is no longer sent
+               
+               TopLevelWindow<?> owner = getOwner();
+               if (owner != null)
+               {
+                  // this is a window connected to an owner, move the owner to top 
+                  WindowManager.moveToTop(owner);
+                  
+                  // and also all the other dialogs owned by the owner, make sure 
+                  // the z-order is preserved
+                  int oId = owner.getId().asInt();
+                  WindowManager.getModalsOwnedBy(oId, true).stream()
+                     .forEach(w -> WindowManager.moveToTop(w));
+                  
+                  // and finally move us to top
+                  WindowManager.moveToTop(this);
+               }
+               else
+               {
+                  // this is a main window, move us to top
+                  WindowManager.moveToTop(this);
+                  
+                  // move to top the modal windows owned by this window, preserve z-order 
+                  WindowManager.getModalsOwnedBy(getId().asInt(), true).stream()
+                     .forEach(w -> WindowManager.moveToTop(w));
+               }
+               
+               // the active-window handle is set BEFORE executing the LEAVE/ENTRY triggers
+               WindowManager.setActiveWindow(owner != null ? owner : this);
+            }
+            else if (!isOverlay())
+            {
+               WindowManager.setActiveWindow(this);
+            }
             
             // do not use the top-level window here as it may not be the active one
             // (consider the TOP-ONLY attribute)
             TopLevelWindow<?> actualActive = WindowManager.getActiveWindow();
             
-            if (oldActive != actualActive)
+            if (needRebuildZorder || !isOverlay())
             {
                final boolean[] entry = new boolean[1];
-               // send leave, only if prev focus was within P2J
-               ThinClient.getInstance().independentEventDrawingBracket(oldActive, new Runnable()
+               if (oldActive != actualActive)
                {
-                  @Override
-                  public void run()
+                  // send leave, only if prev focus was within P2J
+                  ThinClient.getInstance().independentEventDrawingBracket(oldActive, new Runnable()
                   {
-                     // old top receives LEAVE event
-                     entry[0] = activated.withNativeWindow() || 
-                                ThinClient.getInstance().sendLeave(oldActive);
-                     EventManager.postEvent(new FocusEvent(oldActive, EventType.FOCUS_LOST));
-                     oldActive.repaint();
-                     if (oldActive.currentFocus() != null)
+                     @Override
+                     public void run()
                      {
-                        oldActive.currentFocus().repaint();
+                        // old top receives LEAVE event
+                        entry[0] = activated.withNativeWindow() || 
+                                   ThinClient.getInstance().sendLeave(oldActive);
+                        EventManager.postEvent(new FocusEvent(oldActive, EventType.FOCUS_LOST));
+                        oldActive.repaint();
+                        if (oldActive.currentFocus() != null)
+                        {
+                           oldActive.currentFocus().repaint();
+                        }
                      }
-                  }
-               });
+                  });
+               }
+               else
+               {
+                  entry[0] = true;
+               }
                
                if (entry[0])
                {
@@ -796,10 +812,7 @@
                   }
                }
             }
-         }
-         else if (!isOverlay())
-         {
-            WindowManager.setActiveWindow(this);
+            
          }
 
          // title repaint should be done after activation change

=== modified file 'src/com/goldencode/p2j/ui/client/WindowManager.java'
--- src/com/goldencode/p2j/ui/client/WindowManager.java	2016-03-16 06:04:22 +0000
+++ src/com/goldencode/p2j/ui/client/WindowManager.java	2016-03-17 21:52:50 +0000
@@ -518,13 +518,13 @@
     * @return   See above.
     */
    @SuppressWarnings("unchecked")
-   public static <O extends OutputManager<?>> Window<O> getActiveWindow()
+   public static <O extends OutputManager<?>> TopLevelWindow<O> getActiveWindow()
    {
       TopLevelWindow<O> active = (TopLevelWindow<O>) activeWnd.get();
       
       // if the top-level active window is not the main window, return its
       // main window owner
-      return active == null ? null : active.window();
+      return active == null ? null : active;
    }
 
    /**

=== modified file 'src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java'
--- src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java	2016-03-16 06:04:22 +0000
+++ src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java	2016-03-17 16:41:26 +0000
@@ -1042,8 +1042,7 @@
    {
       TopLevelWindow<O> window = topLevelWindow();
       
-      if (WindowManager.topLevelWindow() != window ||
-               WindowManager.getActiveModalWindow() == window)
+      if (WindowManager.topLevelWindow() != window)
       {
          // activate the related window
          WindowManager.activateWindow(window);