diff --git a/lib/widgets/nsi_tag_value_field.dart b/lib/widgets/nsi_tag_value_field.dart
index 51685f1..d05f752 100644
--- a/lib/widgets/nsi_tag_value_field.dart
+++ b/lib/widgets/nsi_tag_value_field.dart
@@ -132,7 +132,14 @@ class _NSITagValueFieldState extends State<NSITagValueField> {
           onChanged: (value) {
             widget.onChanged(value);
           },
-          onSubmitted: (_) => onFieldSubmitted(),
+          onSubmitted: (_) {
+            // Only auto-complete when there's text to match against.
+            // Otherwise, pressing Done on an empty field would auto-select
+            // the first suggestion, preventing users from clearing values.
+            if (controller.text.isNotEmpty) {
+              onFieldSubmitted();
+            }
+          },
         );
       },
       optionsViewBuilder: (