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 56f894b04d..fe3c924414 100644
--- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -441,7 +441,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
         if (query.isSynchronous())
         {
-            while (!(client.currentScreen instanceof GuiMainMenu))
+            while (client.currentScreen instanceof GuiNotification)
             {
                 if (Thread.interrupted()) throw new InterruptedException();
 
@@ -454,11 +454,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     public boolean handleLoadingScreen(ScaledResolution scaledResolution)
     {
-        if (client.currentScreen instanceof GuiMainMenu)
-        {
-            return false;
-        }
-        else
+        if (client.currentScreen instanceof GuiNotification)
         {
             int width = scaledResolution.getScaledWidth();
             int height = scaledResolution.getScaledHeight();
@@ -470,6 +466,10 @@ public class FMLClientHandler implements IFMLSidedHandler
 
             return true;
         }
+        else
+        {
+            return false;
+        }
     }
 
     public WorldClient getWorldClient()