--- old/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	2017-10-06 12:18:16.000000000 -0700
+++ new/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	2017-10-06 12:18:16.000000000 -0700
@@ -674,6 +674,7 @@
                         CWrapper.NSWindow.orderWindow(ptr, CWrapper.NSWindow.NSWindowAbove, ownerPtr);
                     });
                 });
+                execute(CWrapper.NSWindow::orderFront);
                 applyWindowLevel(target);
             }
 
--- /dev/null	2017-10-06 12:18:17.000000000 -0700
+++ new/test/jdk/java/awt/Dialog/HiddenActiveModal/HiddenActiveModalTest.java	2017-10-06 12:18:17.000000000 -0700
@@ -0,0 +1,198 @@
+import javax.imageio.ImageIO; 
+import javax.swing.JDialog; 
+import javax.swing.JFrame; 
+import javax.swing.SwingUtilities; 
+import javax.swing.WindowConstants;
+import java.awt.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener; 
+import java.awt.image.BufferedImage; 
+import java.io.File; 
+import java.io.IOException; 
+import java.lang.reflect.InvocationTargetException; 
+import java.util.Arrays; 
+
+/* @test
+ * @bug 8182638
+ * @summary [macosx] Active modal dialog is hidden by another non-active one
+ * @run main/othervm HiddenActiveModalTest
+ */ 
+
+
+// The test displays two modal dialogs one by one 
+// and checks that the latest modal dialog would be on top of all windows 
+public class HiddenActiveModalTest implements Runnable {
+
+    private static JFrame frame = new JFrame("HiddenActiveModalTest");
+
+    private static boolean verbose = false; 
+    private static boolean passed = true; 
+
+    static DialogThread modalDialogThread1; 
+
+    static DialogThread modalDialogThread2; 
+
+    static class DialogThread { 
+
+        JDialog dialog; 
+
+        private String dialogTitle; 
+        private Point location; 
+        private int width; 
+        private int height; 
+        private DialogListener eventListener;
+        private Color c;
+
+
+        DialogThread(String dialogTitle, Point location, int width, int height, DialogListener eventListener, Color c) {
+            this.dialogTitle = dialogTitle; 
+            this.location = location; 
+            this.width = width; 
+            this.height = height; 
+            this.eventListener = eventListener;
+            this.c = c;
+        }
+
+        void run() { 
+            dialog = new JDialog(frame, true); 
+            dialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+            dialog.getContentPane().setBackground(c);
+            dialog.setTitle(dialogTitle); 
+
+            dialog.setLocation(location); 
+            dialog.setSize(width, height); 
+
+            if (eventListener != null) 
+                dialog.addWindowListener(eventListener); 
+
+            dialog.setVisible(true); 
+        } 
+
+        void removeWindowListener() { 
+            dialog.removeWindowListener(eventListener); 
+        } 
+    } 
+
+    static abstract class DialogListener implements WindowListener { 
+
+        @Override 
+        public void windowClosing(WindowEvent e) { 
+
+        } 
+
+        @Override 
+        public void windowClosed(WindowEvent e) { 
+
+        } 
+
+        @Override 
+        public void windowIconified(WindowEvent e) { 
+
+        } 
+
+        @Override 
+        public void windowDeiconified(WindowEvent e) { 
+
+        } 
+
+        @Override 
+        public void windowActivated(WindowEvent e) { 
+
+        } 
+
+        @Override 
+        public void windowDeactivated(WindowEvent e) { 
+
+        } 
+    } 
+
+    static class FirstDialogListener extends DialogListener { 
+        @Override 
+        public void windowOpened(WindowEvent windowEvent) { 
+            modalDialogThread1.removeWindowListener(); 
+            modalDialogThread2 = new DialogThread( 
+                    "Modal input 2", 
+                    new Point(5, 50), 
+                    300, 200, 
+                    new SecondDialogListener(), Color.GREEN);
+            modalDialogThread2.run(); 
+        } 
+    } 
+
+    static class SecondDialogListener extends DialogListener { 
+        @Override 
+        public void windowOpened(WindowEvent windowEvent) { 
+            try { 
+                Robot robot = new Robot(); 
+                Dimension shotSize = modalDialogThread2.dialog.getContentPane().getSize(); 
+                Rectangle captureRect = new Rectangle(modalDialogThread2.dialog.getContentPane().getLocationOnScreen(),
+                        shotSize); 
+
+                try { 
+                    Thread.sleep(1000); 
+                } catch (InterruptedException e) { 
+                    e.printStackTrace(); 
+                } 
+
+                BufferedImage screenImage = robot.createScreenCapture(captureRect); 
+
+                int rgb; 
+                int expectedRGB = Color.GREEN.getRGB();
+
+
+                for (int row = 1; row < shotSize.height; row++) {
+                    try {
+                        // remove transparance
+                        rgb = screenImage.getRGB(shotSize.width / 2, row);
+
+                        if (verbose) {
+                            System.out.print((rgb == expectedRGB) ? " ." : " " + Integer.toHexString(rgb));
+                        }
+
+                        passed = passed & (expectedRGB == rgb);
+
+                    } catch (ArrayIndexOutOfBoundsException e) {
+                        throw new RuntimeException(e);
+                    }
+
+                }
+
+
+                if (verbose) {
+                    ImageIO.write(screenImage, "bmp", new File("test392.bmp"));
+                }
+
+                if (!passed) 
+                    throw new RuntimeException("The second dialog window was not on top"); 
+
+            } catch (AWTException | IOException e) { 
+                throw new RuntimeException(e); 
+            } 
+            modalDialogThread2.dialog.dispose(); 
+            modalDialogThread1.dialog.dispose(); 
+            frame.dispose(); 
+        } 
+    } 
+
+    public void run() { 
+        frame.setSize(350, 300); 
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); 
+        frame.setVisible(true); 
+
+        modalDialogThread1 = new DialogThread( 
+                "Modal input 1", 
+                new Point(10, 75), 
+                250, 150, 
+                new FirstDialogListener(), Color.RED);
+        modalDialogThread1.run(); 
+    } 
+
+    public static void main(String[] args) throws Exception { 
+        HiddenActiveModalTest.verbose = Arrays.asList(args).contains("-verbose");
+        try { 
+            SwingUtilities.invokeAndWait(new HiddenActiveModalTest());
+        } catch (InterruptedException | InvocationTargetException e) { 
+            throw new RuntimeException(e); 
+        } 
+    } 
+}