--- a/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java	Thu Oct 05 13:29:34 2017 -0700
+++ b/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java	Sat Oct 07 15:58:45 2017 +0100
@@ -191,11 +191,16 @@
     private boolean doRestoreFocus(Component toFocus, Component vetoedComponent,
                                    boolean clearOnFailure)
     {
+        boolean success = true;
         if (toFocus != vetoedComponent && toFocus.isShowing() && toFocus.canBeFocusOwner() &&
-            toFocus.requestFocus(false, FocusEvent.Cause.ROLLBACK))
+            (success = toFocus.requestFocus(false, FocusEvent.Cause.ROLLBACK)))
         {
             return true;
         } else {
+            if (!success && getGlobalFocusedWindow() != SunToolkit.getContainingWindow(toFocus)) {
+                restoreFocusTo = toFocus;
+                return true;
+            }
             Component nextFocus = toFocus.getNextFocusCandidate();
             if (nextFocus != null && nextFocus != vetoedComponent &&
                 nextFocus.requestFocusInWindow(FocusEvent.Cause.ROLLBACK))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/Focus/FocusTransitionTest/FocusTransitionTest.java	Sat Oct 07 15:58:45 2017 +0100
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8155197
+ * @summary Tests whether the value of mostRecentFocusOwner for a window is correct, if
+ *          another window is displayed during focus transition
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main FocusTransitionTest
+ */
+
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class FocusTransitionTest {
+    private static Frame frame;
+    private static TextField textField1;
+    private static Button button;
+
+    public static void main(String[] args) throws InterruptedException {
+        try {
+            Robot robot = Util.createRobot();
+
+            createAndShowGUI();
+            Util.waitForIdle(robot);
+
+            for (int i = 0; i < 100; i++) {
+                Util.clickOnComp(button, robot);
+
+                synchronized (frame) {
+                    frame.wait();
+                }
+                Util.waitForIdle(robot);
+
+                Component focusOwner = frame.getMostRecentFocusOwner();
+                if (focusOwner != textField1) {
+                    throw new RuntimeException("Test FAILED: incorrect focus owner!");
+                }
+            }
+        } finally {
+            if (frame != null) {
+                frame.dispose();
+            }
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame = new Frame("Test Frame");
+
+        textField1 = new TextField(5);
+
+        button = new Button("Go");
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                textField1.requestFocusInWindow();
+                startUpdate();
+            }
+        });
+
+        frame.setLayout(new FlowLayout());
+        frame.setSize(400, 200);
+        frame.add(textField1);
+        frame.add(new TextField(5));
+        frame.add(new TextField(5));
+        frame.add(button);
+        frame.setVisible(true);
+    }
+
+    private static void startUpdate() {
+        UpdateThread updateThread = new UpdateThread(frame, 10);
+        updateThread.start();
+    }
+}
+
+class UpdateThread extends Thread {
+    private final Frame frame;
+    private final int delay;
+
+    UpdateThread(Frame frame, int delay) {
+        this.frame = frame;
+        this.delay = delay;
+    }
+
+    @Override
+    public void run() {
+        Dialog dialog = new Dialog(frame);
+        dialog.setSize(300, 100);
+        dialog.setVisible(true);
+
+        try {
+            sleep(delay);
+        } catch (InterruptedException ie) {
+            ie.printStackTrace();
+        }
+
+        dialog.setVisible(false);
+        dialog.dispose();
+
+        synchronized (frame) {
+            frame.notify();
+        }
+    }
+}
+