diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index bd90387..42dab56 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -769,7 +769,10 @@ void LLNetMap::createObjectImage()
 BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
 	if (gSavedSettings.getBOOL( "MiniMapTeleport" ))
+	{
+		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 		gAgent.teleportViaLocation( viewPosToGlobal(x,y) );
+	}
 	else
 		LLFloaterWorldMap::show(NULL, FALSE);