diff --git a/src/main/java/forge/gui/home/quest/DialogChooseSets.java b/src/main/java/forge/gui/home/quest/DialogChooseSets.java
index f8fa4c118ab..da432a41ce0 100644
--- a/src/main/java/forge/gui/home/quest/DialogChooseSets.java
+++ b/src/main/java/forge/gui/home/quest/DialogChooseSets.java
@@ -112,7 +112,6 @@ public class DialogChooseSets {
         p.add(southPanel, "dock south, gapBottom 10");
       
         overlay.add(p);
-        p.setFocusCycleRoot(true);
         p.getRootPane().setDefaultButton(btnOk);
         SOverlayUtils.showOverlay();
     }
diff --git a/src/main/java/forge/gui/match/ViewWinLose.java b/src/main/java/forge/gui/match/ViewWinLose.java
index caf8b89f62c..e0656f93d59 100644
--- a/src/main/java/forge/gui/match/ViewWinLose.java
+++ b/src/main/java/forge/gui/match/ViewWinLose.java
@@ -8,6 +8,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 import forge.Singletons;
@@ -99,14 +100,7 @@ public class ViewWinLose {
         btnQuit.setText(ForgeProps.getLocalized(WinLoseText.QUIT));
         btnQuit.setFont(FSkin.getFont(22));
 
-
-        if (match.isMatchOver()) {
-            this.getBtnContinue().setEnabled(false);
-            this.getBtnQuit().grabFocus();
-        }
-
         // Show Wins and Loses
-
         final int humanWins = match.getGamesWonBy(human);
         final int humanLosses = match.getPlayedGames().size() - humanWins;
 
@@ -126,7 +120,6 @@ public class ViewWinLose {
         txtLog.setFont(FSkin.getFont(14));
 
         // Add all components accordingly.
-        overlay.removeAll();
         overlay.setLayout(new MigLayout("insets 0, w 100%!, h 100%!"));
         pnlLeft.setLayout(new MigLayout("insets 0, wrap, align center"));
         pnlRight.setLayout(new MigLayout("insets 0, wrap"));
@@ -168,6 +161,16 @@ public class ViewWinLose {
         pnlLog.add(scrLog, "w 300px!, h 100px!, gap 0 0 10px 0");
         pnlLeft.add(pnlLog, "w 100%!");
 
+        boolean matchIsOver = match.isMatchOver();
+        final FButton focusButton = matchIsOver ? btnQuit : btnContinue;
+        btnContinue.setEnabled(!matchIsOver);
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                focusButton.requestFocusInWindow();
+            }
+        });
+        
         SOverlayUtils.showOverlay();
     }
 
diff --git a/src/main/java/forge/gui/toolbox/FOverlay.java b/src/main/java/forge/gui/toolbox/FOverlay.java
index 41e6fea8474..726d97f523e 100644
--- a/src/main/java/forge/gui/toolbox/FOverlay.java
+++ b/src/main/java/forge/gui/toolbox/FOverlay.java
@@ -51,6 +51,7 @@ public enum FOverlay {
     private FOverlay() {
         pnl.setOpaque(false);
         pnl.setVisible(false);
+        pnl.setFocusCycleRoot(true);
 
         btnClose.setForeground(Color.white);
         btnClose.setBorder(BorderFactory.createLineBorder(Color.white));