diff --git a/.luarc.json b/.luarc.json
index 9fb2526..3e0e84b 100644
--- a/.luarc.json
+++ b/.luarc.json
@@ -25,10 +25,11 @@
 		"REFlexFrameTab5",
 		"REFlexFrameTab6",
 		"CalendarFrame",
-		"EasyMenu",
+		"MenuUtil",
 		"PVPMatchResults",
 		"StaticPopupDialogs",
 		"ReloadUI",
+        "GetMouseFoci",
         "REFlexFrame_StatsButton",
         "REFlexFrame_ScoreHolder_RBG",
         "REFlexFrame_ScoreHolder_HK1",
diff --git a/REFlex.lua b/REFlex.lua
index a54e573..a03339e 100644
--- a/REFlex.lua
+++ b/REFlex.lua
@@ -43,7 +43,7 @@ local GetMatchPVPStatColumns = C_PvP.GetMatchPVPStatColumns
 local GetActiveMatchDuration = C_PvP.GetActiveMatchDuration
 local GetCurrentArenaSeason = GetCurrentArenaSeason
 local GetCVar = GetCVar
-local GetMouseFocus = GetMouseFocus
+local GetMouseFoci = GetMouseFoci
 local GetAddOnMetadata = C_AddOns.GetAddOnMetadata
 local UnitName = UnitName
 local UnitFactionGroup = UnitFactionGroup
@@ -61,7 +61,7 @@ local SendAddonMessage = C_ChatInfo.SendAddonMessage
 local PlaySound = PlaySound
 local ElvUI = ElvUI
 
-RE.Version = 3314
+RE.Version = 3315
 RE.LastSquash = 1602662400
 RE.FoundNewVersion = false
 
@@ -299,7 +299,17 @@ function RE:OnEvent(_, event, ...)
 			QTIP:Release(RE.Tooltip)
 		end
 		function RE.LDB:OnClick(button)
-			if REFlex_CompartmentClick or LDBI:GetMinimapButton("REFlex") == GetMouseFocus() then
+			local isMouseOverMinimapButton = false
+			local mouseFoci = GetMouseFoci()
+
+			for _, region in ipairs(mouseFoci) do
+				if region:IsMouseMotionFocus() and region == LDBI:GetMinimapButton("REFlex") then
+					isMouseOverMinimapButton = true
+					break
+				end
+			end
+
+			if REFlex_CompartmentClick or isMouseOverMinimapButton then
 				if button == "LeftButton" then
 					if not REFlexFrame:IsVisible() then
 						REFlexFrame:Show()
@@ -624,7 +634,6 @@ function RE:OnArenaStatsClick(self)
 		QTIP:Release(RE.Tooltip)
 	else
 		CloseDropDownMenus()
-		EasyMenu(RE.StatsDropDown, REFlexStatsDropDown, self, 0 , 0, "MENU")
 	end
 end
 
@@ -687,6 +696,12 @@ function RE:UpdateGUI()
 		REFlexFrameTab6:SetPoint("CENTER", REFlexFrame, "BOTTOMRIGHT", -40, -10)
 		REFlexFrameTab5:SetPoint("RIGHT", REFlexFrameTab6, "LEFT", -3, 0)
 		REFlexFrameTab4:SetPoint("RIGHT", REFlexFrameTab5, "LEFT", -3, 0)
+
+		MenuUtil.CreateButtonMenu(REFlexFrame_StatsButton,
+			{L["Most common teams"], function() RE:GetArenaStatsTooltip(1) end, 1},
+			{L["Easiest teams"], function() RE:GetArenaStatsTooltip(2) end, 2},
+			{L["Hardest teams"], function() RE:GetArenaStatsTooltip(3) end, 3}
+		)
 	end
 	if PanelTemplates_GetSelectedTab(REFlexFrame) < 4 then
 		RE.TableBG:Show()
diff --git a/REFlex.toc b/REFlex.toc
index 2daa7d0..186f639 100644
--- a/REFlex.toc
+++ b/REFlex.toc
@@ -1,7 +1,7 @@
-## Interface: 100207
+## Interface: 110000
 ## Title: |cFF74D06CRE|rFlex
 ## Notes: Collect statistics of played arena matches and battlegrounds.
-## Version: 3.3.14
+## Version: 3.3.15
 ## Author: AcidWeb
 ## SavedVariablesPerCharacter: REFlexSettings, REFlexDatabase, REFlexHonorDatabase
 ## AddonCompartmentFunc: REFlex_CompartmentOnClick
diff --git a/REFlex.xml b/REFlex.xml
index bbcf741..51c201a 100644
--- a/REFlex.xml
+++ b/REFlex.xml
@@ -6,8 +6,6 @@
 	<Script file="REFlexStructures.lua"/>
 	<Script file="REFlexUpdater.lua"/>
 
-	<Frame name="REFlexStatsDropDown" inherits="UIDropDownMenuTemplate" id="1" hidden="true"/>
-
 	<Frame name="REFlexFrame" inherits="BackdropTemplate" resizable="false" movable="true" hidden="true" parent="UIParent">
 		<Size>
 			<AbsDimension x="790" y="625"/>
@@ -71,7 +69,7 @@
 					<OnClick>REFlex:DumpCSV()</OnClick>
 				</Scripts>
 			</Button>
-			<Button name="$parent_StatsButton" text="S" inherits="UIPanelButtonTemplate">
+			<DropdownButton name="$parent_StatsButton" text="S" inherits="UIPanelButtonTemplate">
 				<Size>
 					<AbsDimension x="20" y="20"/>
 				</Size>
@@ -85,7 +83,7 @@
 				<Scripts>
 					<OnClick>REFlex:OnArenaStatsClick(self)</OnClick>
 				</Scripts>
-			</Button>
+			</DropdownButton>
 			<Button name="$parentTab1" inherits="CharacterFrameTabTemplate" id="1">
 				<Anchors>
 					<Anchor point="CENTER" relativePoint="BOTTOMLEFT">
diff --git a/REFlexStructures.lua b/REFlexStructures.lua
index a7e275c..31cd6f0 100644
--- a/REFlexStructures.lua
+++ b/REFlexStructures.lua
@@ -194,12 +194,6 @@ for classID=1, MAX_CLASSES do
 	end
 end
 
-RE.StatsDropDown = {
-	{ text = L["Most common teams"], notCheckable = true, func = function() RE:GetArenaStatsTooltip(1) end },
-	{ text = L["Easiest teams"], notCheckable = true, func = function() RE:GetArenaStatsTooltip(2) end },
-	{ text = L["Hardest teams"], notCheckable = true, func = function() RE:GetArenaStatsTooltip(3) end }
-}
-
 RE.AceConfig = {
 	type = "group",
 	args = {