diff --git a/aqt/tagedit.py b/aqt/tagedit.py
index 0744a8cf4..46b8e2cbb 100644
--- a/aqt/tagedit.py
+++ b/aqt/tagedit.py
@@ -34,6 +34,9 @@ class TagEdit(QLineEdit):
         self.showCompleter()
 
     def keyPressEvent(self, evt):
+        if evt.key() in (Qt.Key_Enter, Qt.Key_Return):
+            self.hideCompleter()
+            return
         QLineEdit.keyPressEvent(self, evt)
         if not evt.text():
             # if it's a modifier, don't show