diff --git a/api/config.lua b/api/config.lua
index 75499f4c..64f155b3 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -176,6 +176,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", "minimap",     "addon_buttons",    "0")
   pfUI:UpdateConfig("appearance", "worldmap",    "tooltipsize",      "0")
   pfUI:UpdateConfig("appearance", "worldmap",    "mapreveal",        "0")
   pfUI:UpdateConfig("appearance", "worldmap",    "mapreveal_color",  ".4,.4,.4,1")
diff --git a/modules/addonbuttons.lua b/modules/addonbuttons.lua
index d06c9092..23c7729d 100644
--- a/modules/addonbuttons.lua
+++ b/modules/addonbuttons.lua
@@ -49,6 +49,18 @@ pfUI:RegisterModule("addonbuttons", "vanilla:tbc", function ()
     end
   end)
 
+  -- hide flyout frame when entering combat
+  local pfUIAddonButtonHide = CreateFrame("Frame", nil, UIParent)
+  pfUIAddonButtonHide:RegisterEvent('PLAYER_REGEN_DISABLED')
+  pfUIAddonButtonHide:SetScript("OnEvent", function()
+    local enabled = C.appearance.minimap.addon_buttons == "1"
+    if enabled then
+      if pfUI.addonbuttons:IsShown() then
+        pfUI.addonbuttons:Hide()
+      end
+    end
+  end)
+
   pfUI.addonbuttons.buttons = {}
   pfUI.addonbuttons.overrides = {}
   pfUI.addonbuttons.last_updated = 0
diff --git a/modules/gui.lua b/modules/gui.lua
index 7ec65730..97fd3f36 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1873,6 +1873,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["Show PvP Icon"], C.unitframes.player, "showPVPMinimap", "checkbox")
       CreateConfig(nil, T["Show Inactive Tracking"], C.appearance.minimap, "tracking_pulse", "checkbox")
       CreateConfig(nil, T["Tracking Icon Size"], C.appearance.minimap, "tracking_size")
+      CreateConfig(nil, T["Hide Addon Buttons On Combat"], C.appearance.minimap, "addon_buttons", "checkbox")
     end)
 
     CreateGUIEntry(T["Minimap"], T["Addon Buttons"], function()