diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 14a1a4abdc..96232fe85f 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -133,9 +133,11 @@ class DateEdit(QDateEdit):
 
     def focusInEvent(self, x):
         self.setSpecialValueText('')
+        QDateEdit.focusInEvent(self, x)
 
     def focusOutEvent(self, x):
         self.setSpecialValueText(_('Undefined'))
+        QDateEdit.focusOutEvent(self, x)
 
     def set_to_today(self):
         self.setDate(now())
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 9f1a72b021..89008735fe 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -1216,7 +1216,9 @@ class DeviceBooksModel(BooksModel): # {{{
         return done
 
     def set_editable(self, editable):
-        self.editable = editable
+        # Cannot edit if metadata is sent on connect. Reason: changes will
+        # revert to what is in the library on next connect.
+        self.editable = editable and prefs['manage_device_metadata']!='on_connect'
 
     def set_search_restriction(self, s):
         pass