diff --git a/Breakables.lua b/Breakables.lua
index 9b0d9e3..b15ef52 100644
--- a/Breakables.lua
+++ b/Breakables.lua
@@ -310,6 +310,8 @@ function Breakables:RegisterEvents()
 	self:RegisterEvent("PLAYER_REGEN_DISABLED", "OnEnterCombat")
 	self:RegisterEvent("PLAYER_REGEN_ENABLED", "OnLeaveCombat")
 
+	self:RegisterEvent("MODIFIER_STATE_CHANGED", "FindBreakables")
+
 	if CanDisenchant then
 		self:RegisterEvent("TRADE_SKILL_UPDATE", "OnTradeSkillUpdate")
 	end
@@ -319,6 +321,12 @@ function Breakables:RegisterEvents()
 	end
 end
 
+function Breakables:OnModifierChanged()
+	if showingTooltip ~= nil and not self.bCombat then
+		self:OnEnterBreakableButton(showingTooltip)
+	end
+end
+
 function Breakables:OnDisable()
 	self:UnregisterAllEvents()
 	self.frame:SetScript("OnUpdate", nil)