diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py
index aa2a1a5958..c1b9230f42 100644
--- a/src/calibre/gui2/preferences/columns.py
+++ b/src/calibre/gui2/preferences/columns.py
@@ -105,7 +105,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
             return
         self.opt_columns.item(idx).setCheckState(False)
         self.opt_columns.takeItem(idx)
-        self.custcols[col]['*deleteme'] = True
+        if self.custcols[col]['colnum'] is None:
+            del self.custcols[col] # A newly-added column was deleted
+        else:
+            self.custcols[col]['*deleteme'] = True
         self.changed_signal.emit()
 
     def add_custcol(self):
diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py
index 9cad1293a9..e8ab8707e2 100644
--- a/src/calibre/gui2/preferences/create_custom_column.py
+++ b/src/calibre/gui2/preferences/create_custom_column.py
@@ -161,7 +161,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
         else:
             idx = self.parent.opt_columns.currentRow()
             item = self.parent.opt_columns.item(idx)
-            item.setData(Qt.UserRole, QVariant(key))
             item.setText(col_heading)
             self.parent.custcols[self.orig_column_name]['label'] = col
             self.parent.custcols[self.orig_column_name]['name'] = col_heading