diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index dda155d0df0fb7886757b5e87c2d3fb871d0d5e1..a6a9447e39527dcef3f1082935ef3769ef76a590 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1548,6 +1548,8 @@ BOOL idle_startup()
 		}	
 		gLoginMenuBarView->setVisible( FALSE );
 
+		gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
+
 		if (!gNoRender)
 		{
 			// Move the progress view in front of the UI
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index bc41a88e2766978454dd064f736bdf6b6fe390b7..4baafbcfa4be0374e8a246f948c018ec5dadbd77 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1905,7 +1905,6 @@ void LLViewerWindow::initWorldUI()
 		// TODO: Move instance management into class
 		gFloaterMap = new LLFloaterMap("Map");
 		gFloaterMap->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
-		gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
 
 		// keep onscreen
 		gFloaterView->adjustToFitScreen(gFloaterMap, FALSE);