diff --git a/modules/map.lua b/modules/map.lua
index 11b5838e..dabfa7f3 100644
--- a/modules/map.lua
+++ b/modules/map.lua
@@ -10,9 +10,11 @@ pfUI:RegisterModule("map", function ()
 
     WorldMapFrame:SetScript('OnShow', function()
       -- default events
-      UpdateMicroButtons();
-      PlaySound("igQuestLogOpen");
-      CloseDropDownMenus();
+      UpdateMicroButtons()
+      PlaySound("igQuestLogOpen")
+      CloseDropDownMenus()
+      SetMapToCurrentZone()
+      WorldMapFrame_PingPlayerPosition()
 
       -- customize
       WorldMapFrame:SetMovable(true)