diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
index bfb8cb78f8..83579e22c4 100644
--- a/src/calibre/gui2/library/delegates.py
+++ b/src/calibre/gui2/library/delegates.py
@@ -472,8 +472,10 @@ class CcTextDelegate(QStyledItemDelegate, UpdateEditorGeometry):  # {{{
         editor.selectAll()
 
     def setModelData(self, editor, model, index):
-        val = editor.text()
-        model.setData(index, (val), Qt.EditRole)
+        val = editor.text() or ''
+        if not isinstance(editor, EditWithComplete):
+            val = val.strip()
+        model.setData(index, val, Qt.EditRole)
 # }}}
 
 class CcLongTextDelegate(QStyledItemDelegate):  # {{{