diff --git a/doc/contributions.txt b/doc/contributions.txt
index ab5eddd92d1941e3f5de59e2f9f0ccbc2155c571..d071fc0c772d6db86f821bac2833e94294befde2 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -718,6 +718,7 @@ Jonathan Yap
 	STORM-2030
 	STORM-2034
 	STORM-2018
+	STORM-2088
 Kadah Coba
 	STORM-1060
     STORM-1843
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 1685a18e26277de3994fa762a53386770745d61e..fbd9b127b681e1d4f47c141ef7eda0e7e7225afa 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -97,13 +97,13 @@ LLNetMap::LLNetMap (const Params & p)
 	mToolTipMsg(),
 	mPopupMenu(NULL)
 {
+	mScale = gSavedSettings.getF32("MiniMapScale");
+	mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
 	mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
-	setScale(gSavedSettings.getF32("MiniMapScale"));
 }
 
 LLNetMap::~LLNetMap()
 {
-	gSavedSettings.setF32("MiniMapScale", mScale);
 }
 
 BOOL LLNetMap::postBuild()
@@ -138,6 +138,8 @@ void LLNetMap::setScale( F32 scale )
 	mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
 	mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
+	gSavedSettings.setF32("MiniMapScale", mScale);
+
 	mUpdateNow = true;
 }