diff --git a/ankiqt/ui/tagedit.py b/ankiqt/ui/tagedit.py
index 95771bdf8..6826378e8 100644
--- a/ankiqt/ui/tagedit.py
+++ b/ankiqt/ui/tagedit.py
@@ -32,6 +32,17 @@ class TagEdit(QLineEdit):
         QLineEdit.focusOutEvent(self, evt)
         self.emit(SIGNAL("lostFocus"))
 
+    def keyPressEvent(self, evt):
+        if evt.key() in (Qt.Key_Enter, Qt.Key_Return):
+            evt.accept()
+            if self.completer.completionCount():
+                self.setText(
+                    self.completer.pathFromIndex(self.completer.popup().currentIndex()))
+            else:
+                self.setText(self.completer.completionPrefix())
+            return
+        QLineEdit.keyPressEvent(self, evt)
+
 class TagCompleter(QCompleter):
 
     def __init__(self, model, parent, edit, *args):