diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java
index 7d204b3..ffe8f79 100644
--- a/src/com/annimon/turrets/GameCanvas.java
+++ b/src/com/annimon/turrets/GameCanvas.java
@@ -211,7 +211,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
                 socketHelper.close();
             } catch (IOException ex) { }
         }
-        Main.getInstance().switchLayout(Main.getInstance().getMainMenu());
+        Main.getInstance().switchToMainMenu();
     }
     
     private boolean allowMove() {
diff --git a/src/com/annimon/turrets/Main.java b/src/com/annimon/turrets/Main.java
index d0af3d1..4a8e1cd 100644
--- a/src/com/annimon/turrets/Main.java
+++ b/src/com/annimon/turrets/Main.java
@@ -40,8 +40,8 @@ public class Main extends JFrame {
         Sound.setEnabled(Prefs.getInstance().soundEnabled());
     }
     
-    public Component getMainMenu() {
-        return mainMenu;
+    public void switchToMainMenu() {
+        switchLayout(mainMenu);
     }
     
     public void switchLayout(Component component) {
diff --git a/src/com/annimon/turrets/OptionsPanel.java b/src/com/annimon/turrets/OptionsPanel.java
index 1502195..6710022 100644
--- a/src/com/annimon/turrets/OptionsPanel.java
+++ b/src/com/annimon/turrets/OptionsPanel.java
@@ -106,7 +106,7 @@ public class OptionsPanel extends JPanel {
             
             final String ip = ipTextField.getText();
             if (validateIp(ip)) Prefs.getInstance().setLastIp(ip);
-            Main.getInstance().switchLayout(Main.getInstance().getMainMenu());
+            Main.getInstance().switchToMainMenu();
         }
     };
     
@@ -119,4 +119,4 @@ public class OptionsPanel extends JPanel {
         }
     }
 
-}
+};