diff --git a/Bartender4.lua b/Bartender4.lua
index 48b0817..8f8ec02 100644
--- a/Bartender4.lua
+++ b/Bartender4.lua
@@ -48,6 +48,7 @@ end
 
 function Bartender4:CombatLockdown()
 	self:Lock()
+	LibStub("AceConfigDialog-3.0"):Close("Bartender4") 
 end
 
 function Bartender4:ToggleLock()
diff --git a/Options.lua b/Options.lua
index a96fdc5..6c4ef4c 100644
--- a/Options.lua
+++ b/Options.lua
@@ -148,6 +148,7 @@ function Bartender4:SetupOptions()
 	
 	LibStub("AceConfig-3.0"):RegisterOptionsTable("Bartender4", self.options, "bttest")
 	local optFunc = function() 
+		if InCombatLockdown() then return end
 		AceConfigDialog:Open("Bartender4") 
 	--[[ 
 		local status = AceConfigDialog:GetStatusTable("Bartender4")
diff --git a/StanceBar.lua b/StanceBar.lua
index cef4b62..3336e48 100644
--- a/StanceBar.lua
+++ b/StanceBar.lua
@@ -53,6 +53,10 @@ function StanceBarMod:SetupOptions()
 	ActionBars.options.args["stance"].args = self.options.table
 end
 
+function StanceBarMod:ApplyConfig()
+	self.bar:ApplyConfig(self.db.profile)
+end
+
 function StanceButtonPrototype:Update()
 	if not self:IsShown() then return end
 	local id = self:GetID()