diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
index 63107b2444..fc8de55189 100644
--- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
+++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
@@ -284,7 +284,7 @@ function lib:CreateButton(id, name, header, config)
 		KeyBound = LibStub("LibKeyBound-1.0", true)
 	end
 
-	local button = setmetatable(CreateFrame("CheckButton", name, header, "SecureActionButtonTemplate, ActionButtonTemplate"), Generic_MT)
+	local button = setmetatable(CreateFrame("CheckButton", name, header, "SecureActionButtonTemplate, ActionButtonTemplate, FlyoutPopupButtonTemplate"), Generic_MT)
 	button:RegisterForDrag("LeftButton", "RightButton")
 	if WoWRetail then
 		button:RegisterForClicks("AnyDown", "AnyUp")
@@ -2524,7 +2524,9 @@ if ActionButton_UpdateFlyout then
 		if self.FlyoutBorder then
 			self.FlyoutBorder:Hide()
 		end
-		self.FlyoutBorderShadow:Hide()
+		if self.FlyoutBorderShadow then
+			self.FlyoutBorderShadow:Hide()
+		end
 		if self._state_type == "action" then
 			-- based on ActionButton_UpdateFlyout in ActionButton.lua
 			local actionType = GetActionInfo(self._state_action)
@@ -2558,6 +2560,10 @@ if ActionButton_UpdateFlyout then
 	end
 else
 	function UpdateFlyout(self, isButtonDownOverride)
+		if not self.FlyoutArrowContainer then return end
+		if self.FlyoutBorderShadow then
+			self.FlyoutBorderShadow:Hide()
+		end
 		if self._state_type == "action" then
 			-- based on ActionButton_UpdateFlyout in ActionButton.lua
 			local actionType = GetActionInfo(self._state_action)