diff --git a/Dominos/core/bindingsController.lua b/Dominos/core/bindingsController.lua
index a61d27f5..381d7543 100644
--- a/Dominos/core/bindingsController.lua
+++ b/Dominos/core/bindingsController.lua
@@ -184,6 +184,7 @@ function BindingsController:RegisterEvents()
 	self:RegisterEvent('UPDATE_BINDINGS')
 	self:RegisterEvent('PLAYER_LOGIN')
 	self:RegisterEvent('CVAR_UPDATE')
+	self:RegisterEvent("ACTIONBAR_UPDATE_STATE")
 end
 
 function BindingsController:OnEvent(event, ...)
@@ -212,6 +213,14 @@ function BindingsController:CVAR_UPDATE(event, variableName)
 	end
 end
 
+function BindingsController:ACTIONBAR_UPDATE_STATE()
+	for button in pairs(self.surrogates) do
+		if not button:GetChecked() then
+			button:SetButtonState('NORMAL')
+		end
+	end
+end
+
 function BindingsController:Register(button, createSurrogate)
 	if self.frames[button] then
 		return