diff --git a/src/Classes/ConfigSetListControl.lua b/src/Classes/ConfigSetListControl.lua
index b4c50e36db..c38e809d76 100644
--- a/src/Classes/ConfigSetListControl.lua
+++ b/src/Classes/ConfigSetListControl.lua
@@ -52,7 +52,7 @@ function ConfigSetListClass:RenameSet(configSet, addOnName)
 		if addOnName then
 			t_insert(self.list, configSet.id)
 			self.selIndex = #self.list
-			self.selValue = configSet
+			self.selValue = configSet.id
 		end
 		self.configTab:AddUndoState()
 		self.configTab.build:SyncLoadouts()
diff --git a/src/Classes/ItemSetListControl.lua b/src/Classes/ItemSetListControl.lua
index 0292026aba..04d87e8537 100644
--- a/src/Classes/ItemSetListControl.lua
+++ b/src/Classes/ItemSetListControl.lua
@@ -53,7 +53,7 @@ function ItemSetListClass:RenameSet(itemSet, addOnName)
 		if addOnName then
 			t_insert(self.list, itemSet.id)
 			self.selIndex = #self.list
-			self.selValue = itemSet
+			self.selValue = itemSet.id
 		end
 		self.itemsTab:AddUndoState()
 		self.itemsTab.build:SyncLoadouts()
diff --git a/src/Classes/SkillSetListControl.lua b/src/Classes/SkillSetListControl.lua
index d93e175ae9..c8208c476d 100644
--- a/src/Classes/SkillSetListControl.lua
+++ b/src/Classes/SkillSetListControl.lua
@@ -62,7 +62,7 @@ function SkillSetListClass:RenameSet(skillSet, addOnName)
 		if addOnName then
 			t_insert(self.list, skillSet.id)
 			self.selIndex = #self.list
-			self.selValue = skillSet
+			self.selValue = skillSet.id
 		end
 		self.skillsTab:AddUndoState()
 		self.skillsTab.build:SyncLoadouts()