diff --git a/src/main/java/forge/control/home/ControlSettings.java b/src/main/java/forge/control/home/ControlSettings.java
index db33b9ad8f0..1263f2d3817 100644
--- a/src/main/java/forge/control/home/ControlSettings.java
+++ b/src/main/java/forge/control/home/ControlSettings.java
@@ -15,6 +15,7 @@ import javax.swing.event.ListSelectionListener;
 import forge.Command;
 import forge.Constant;
 import forge.Singletons;
+import forge.control.FControl;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.view.home.ViewSettings;
@@ -217,10 +218,8 @@ public class ControlSettings {
 
             @Override
             protected void done() {
-                view.getLblTitleSkin().setIcon(null);
-                view.getLblTitleSkin().setText("Choose Skin");
-
-                Singletons.getControl().changeState(0);
+                Singletons.getView().instantiateCachedUIStates();
+                Singletons.getControl().changeState(FControl.HOME_SCREEN);
                 Singletons.getView().getHomeView().showSettingsMenu();
             }
         };
diff --git a/src/main/java/forge/view/FView.java b/src/main/java/forge/view/FView.java
index f8f3996fcaf..074aad5663e 100644
--- a/src/main/java/forge/view/FView.java
+++ b/src/main/java/forge/view/FView.java
@@ -101,10 +101,7 @@ public final class FView extends JFrame {
                 FView.this.lpnContent.add(overlay, JLayeredPane.MODAL_LAYER);
 
                 // Instantiate all different state screens
-                FView.this.home = new ViewHomeUI();
-                FView.this.match = new ViewMatchUI();
-                FView.this.editor = new ViewEditorUI();
-                FView.this.bazaar = new ViewBazaarUI();
+                instantiateCachedUIStates();
 
                 // All is ready to go - fire up home screen and discard splash frame.
                 Singletons.getControl().changeState(FControl.HOME_SCREEN);
@@ -178,4 +175,12 @@ public final class FView extends JFrame {
         }
         return FView.this.bazaar;
     }
+
+    /** Like it says. */
+    public void instantiateCachedUIStates() {
+        FView.this.home = new ViewHomeUI();
+        FView.this.match = new ViewMatchUI();
+        FView.this.editor = new ViewEditorUI();
+        FView.this.bazaar = new ViewBazaarUI();
+    }
 }