diff --git a/plugins/chatbox/derma/cl_chatbox.lua b/plugins/chatbox/derma/cl_chatbox.lua
index d73aafe7a..335254a23 100644
--- a/plugins/chatbox/derma/cl_chatbox.lua
+++ b/plugins/chatbox/derma/cl_chatbox.lua
@@ -170,7 +170,7 @@ function PANEL:AddTab(id, filter)
 	panel:SetFilter(filter or {})
 
 	button.DoRightClick = function(this)
-		ix.gui.chat:OnTabRightClick(this, panel, id)
+		ix.gui.chat:OnTabRightClick(this, panel, panel:GetID())
 	end
 
 	self.tabs[id] = panel
@@ -209,8 +209,14 @@ function PANEL:RenameTab(id, newID)
 	tab:GetButton():SetText(newID)
 	tab:GetButton():SizeToContents()
 
+	tab:SetID(newID)
+
 	self.tabs[id] = nil
 	self.tabs[newID] = tab
+
+	if (id == self:GetActiveTabID()) then
+		self:SetActiveTab(newID)
+	end
 end
 
 function PANEL:SetActiveTab(id)
diff --git a/plugins/chatbox/derma/cl_chatboxcustomize.lua b/plugins/chatbox/derma/cl_chatboxcustomize.lua
index c07f820b2..28d498e6f 100644
--- a/plugins/chatbox/derma/cl_chatboxcustomize.lua
+++ b/plugins/chatbox/derma/cl_chatboxcustomize.lua
@@ -89,7 +89,7 @@ end
 function PANEL:CreateClicked()
 	local name = self.tab and self.tab or self.name:GetValue()
 
-	if (self.tab != self.name:GetValue() and PLUGIN:TabExists(name)) then
+	if (self.tab != self.name:GetValue() and PLUGIN:TabExists(self.name:GetValue())) then
 		ix.util.Notify(L("chatTabExists"))
 		return
 	end