diff --git a/ankiqt/ui/tagedit.py b/ankiqt/ui/tagedit.py
index dad218d8c..8d1152ab3 100644
--- a/ankiqt/ui/tagedit.py
+++ b/ankiqt/ui/tagedit.py
@@ -36,12 +36,15 @@ class TagEdit(QLineEdit):
 
     def keyPressEvent(self, evt):
         if evt.key() in (Qt.Key_Enter, Qt.Key_Return):
-            evt.accept()
-            if self.completer.completionCount():
+            evt.ignore()
+            if not self.text():
+                pass
+            elif self.completer.completionCount():
                 self.setText(
                     self.completer.pathFromIndex(self.completer.popup().currentIndex()))
             else:
                 self.setText(self.completer.completionPrefix())
+            self.completer.popup().hide()
             return
         QLineEdit.keyPressEvent(self, evt)