diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
new file mode 100644
index 000000000..ba3e4b741
--- /dev/null
+++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch
@@ -0,0 +1,27 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
++++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.gui;
+ 
++import cpw.mods.fml.client.FMLClientHandler;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.text.DateFormat;
+@@ -126,7 +127,7 @@
+             }
+             else if (p_146284_1_.field_146127_k == 1)
+             {
+-                this.func_146615_e(this.field_146640_r);
++                FMLClientHandler.instance().tryLoadWorld(this,this.field_146640_r);
+             }
+             else if (p_146284_1_.field_146127_k == 3)
+             {
+@@ -253,7 +254,7 @@
+ 
+             if (p_148144_2_ && flag1)
+             {
+-                GuiSelectWorld.this.func_146615_e(p_148144_1_);
++                FMLClientHandler.instance().tryLoadWorld(GuiSelectWorld.this,p_148144_1_);
+             }
+         }
+ 
diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
index 7c07b9cb9..8ae106b58 100644
--- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -548,6 +548,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     public void tryLoadWorld(GuiSelectWorld selectWorldGUI, int selectedIndex)
     {
+        playClientBlock = new CountDownLatch(1);
         selectWorldGUI.func_146615_e(selectedIndex);
     }