diff --git a/broker.lua b/broker.lua
index ba6f1be..5905940 100644
--- a/broker.lua
+++ b/broker.lua
@@ -10,8 +10,12 @@ local function OnClick(self, button)
 		if(IsShiftKeyDown()) then
 			zzCoords_MinimapToggle()
 		else
-			InterfaceOptionsFrame_OpenToCategory(childName)
-			InterfaceOptionsFrame_OpenToCategory(childName)
+			if(InterfaceOptionsFrame:IsVisible() and not InCombatLockdown()) then
+				InterfaceOptionsFrame:Hide()
+			else
+				InterfaceOptionsFrame_OpenToCategory(childName)
+				InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory
+			end
 		end
 	elseif(button == "LeftButton") then
 		if(IsShiftKeyDown()) then