diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua
index 01de7c3..bce5ea6 100644
--- a/modules/PlayerHealth.lua
+++ b/modules/PlayerHealth.lua
@@ -915,6 +915,10 @@ function PlayerHealth.prototype:EnableClickTargeting(bEnable)
 	else
 		self.frame.button:EnableMouse(false)
 		self.frame.button:RegisterForClicks()
+
+		-- set up click casting
+		ClickCastFrames = ClickCastFrames or {}
+		ClickCastFrames[self.frame.button] = true
 	end
 end
 
diff --git a/modules/TargetInfo.lua b/modules/TargetInfo.lua
index 4370ab8..a60cf28 100644
--- a/modules/TargetInfo.lua
+++ b/modules/TargetInfo.lua
@@ -797,6 +797,9 @@ function IceTargetInfo.prototype:CreateFrame(redraw)
 		self.frame:SetScript("OnEnter", function(frame) self:OnEnter(frame) end)
 		self.frame:SetScript("OnLeave", function(frame) self:OnLeave(frame) end)
 
+		self.frame:SetAttribute("type1", "target")
+		self.frame:SetAttribute("type2", "menu")
+
 		-- set up click casting
 		ClickCastFrames = ClickCastFrames or {}
 		ClickCastFrames[self.frame] = true
@@ -806,6 +809,9 @@ function IceTargetInfo.prototype:CreateFrame(redraw)
 		self.frame:SetScript("OnEnter", nil)
 		self.frame:SetScript("OnLeave", nil)
 
+		self.frame:SetAttribute("type1")
+		self.frame:SetAttribute("type2")
+
 		-- set up click casting
 		ClickCastFrames = ClickCastFrames or {}
 		ClickCastFrames[self.frame] = false
@@ -813,9 +819,6 @@ function IceTargetInfo.prototype:CreateFrame(redraw)
 
 	self.frame.unit = self.unit
 
-	-- set up stuff for clicking
-	self.frame:SetAttribute("type1", "target")
-	self.frame:SetAttribute("type2", "menu")
 	self.frame:SetAttribute("unit", self.unit)
 
 	self.frame.menu = function()