diff --git a/api/config.lua b/api/config.lua
index 7412026c..866ba2d1 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -170,6 +170,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("appearance", "minimap",     "coordsloc",        "bottomleft")
   pfUI:UpdateConfig("appearance", "minimap",     "tracking_size",    "16")
   pfUI:UpdateConfig("appearance", "minimap",     "tracking_pulse",   "1")
+  pfUI:UpdateConfig("appearance", "worldmap",    "tooltipsize",      "0")
   pfUI:UpdateConfig("appearance", "worldmap",    "mapreveal",        "0")
   pfUI:UpdateConfig("appearance", "worldmap",    "mapreveal_color",  ".4,.4,.4,1")
   pfUI:UpdateConfig("appearance", "worldmap",    "groupcircles",     "3")
diff --git a/modules/gui.lua b/modules/gui.lua
index ae9d7743..243d961d 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1162,6 +1162,19 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
         "-1:" .. T["Large"],
         "-3:" .. T["Huge"],
       },
+      ["maptooltip"] = {
+        ".10:10%",
+        ".20:20%",
+        ".30:30%",
+        ".40:40%",
+        ".50:50%",
+        ".60:60%",
+        ".70:70%",
+        ".80:80%",
+        ".90:90%",
+        "1:100%",
+        "0:" .. T["World Map Scale"],
+      },
       ["textalign"] = {
         "LEFT:" .. T["Left"],
         "CENTER:" .. T["Center"],
@@ -1485,6 +1498,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["Border Color"], C.appearance.border, "color", "color")
       CreateConfig(U["mapreveal"], T["Map Reveal Color"], C.appearance.worldmap, "mapreveal_color", "color")
       CreateConfig(U["mapcolors"], T["Map Group/Raid Circle Size"], C.appearance.worldmap, "groupcircles", "dropdown", pfUI.gui.dropdowns.mapcircle)
+      CreateConfig(U["map"], T["Map Tooltip Scale"], C.appearance.worldmap, "tooltipsize", "dropdown", pfUI.gui.dropdowns.maptooltip)
       CreateConfig(nil) -- spacer
       CreateConfig(nil, T["Enable Frame Shadow"], C.appearance.border, "shadow", "checkbox")
       CreateConfig(nil, T["Frame Shadow Intensity"], C.appearance.border, "shadow_intensity", "dropdown", pfUI.gui.dropdowns.uf_debuff_indicator_size)
diff --git a/modules/map.lua b/modules/map.lua
index 5e4560c2..828e8ebb 100644
--- a/modules/map.lua
+++ b/modules/map.lua
@@ -1,6 +1,22 @@
 pfUI:RegisterModule("map", "vanilla:tbc", function ()
   table.insert(UISpecialFrames, "WorldMapFrame")
 
+  local function UpdateTooltipScale()
+    -- load scale data
+    local tooltipscale = tonumber(C.appearance.worldmap.tooltipsize)
+    local scale = WorldMapFrame:GetScale()
+
+    -- apply tooltip scale
+    if tooltipscale > 0 then
+      WorldMapTooltip:SetScale(tooltipscale/scale)
+    else
+      WorldMapTooltip:SetScale(1)
+    end
+  end
+
+  -- register config update handler
+  pfUI.map = { UpdateConfig = UpdateTooltipScale }
+
   function _G.ToggleWorldMap()
     if WorldMapFrame:IsShown() then
       WorldMapFrame:Hide()
@@ -45,6 +61,7 @@ pfUI:RegisterModule("map", "vanilla:tbc", function ()
       if IsControlKeyDown() then
         scale = clamp(WorldMapFrame:GetScale() + arg1/10, 0.1, 2.0)
         WorldMapFrame:SetScale(scale)
+        UpdateTooltipScale()
       end
 
       SaveMovable(this, true)
@@ -64,6 +81,7 @@ pfUI:RegisterModule("map", "vanilla:tbc", function ()
 
     WorldMapFrame:SetAlpha(alpha)
     WorldMapFrame:SetScale(scale)
+    UpdateTooltipScale()
 
     WorldMapFrame:ClearAllPoints()
     WorldMapFrame:SetPoint("CENTER", UIParent, "CENTER", 0, 0)