diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart
index f699c1212..84bf5d2e9 100644
--- a/lib/ui/app/entity_dropdown.dart
+++ b/lib/ui/app/entity_dropdown.dart
@@ -133,6 +133,13 @@ class _EntityDropdownDialogState extends State<EntityDropdownDialog> {
           ),
           Expanded(
             child: TextField(
+              onSubmitted: (value) {
+                final entityId = widget.entityList.firstWhere((entityId) =>
+                    widget.entityMap[entityId].matchesFilter(_filter));
+                final entity = widget.entityMap[entityId];
+                widget.onSelected(entity);
+                Navigator.pop(context);
+              },
               onChanged: (value) {
                 setState(() {
                   _filter = value;