Index: src/client/zonehandler.cpp
===================================================================
--- src/client/zonehandler.cpp	(revision 5677)
+++ src/client/zonehandler.cpp	(working copy)
@@ -212,7 +212,7 @@
     }
 
     // Set load screen if required.
-    if(FindLoadWindow() && psengine->GetLoader()->GetLoadingCount() != 0 &&
+    if(FindLoadWindow() && (psengine->GetLoader()->GetLoadingCount() != 0 || !psengine->HasLoadedMap()) &&
       (!psengine->BackgroundWorldLoading() || !psengine->HasLoadedMap() || !connected))
     {
         loading = true;