diff --git a/ui/fields/fields.templ b/ui/fields/fields.templ
index 3a76103..da443eb 100644
--- a/ui/fields/fields.templ
+++ b/ui/fields/fields.templ
@@ -183,7 +183,7 @@ func FieldsAsSelectorOptions(form frm.Form, fieldID uuid.UUID) (options []select
 		}
 		selected := false
 		for _, f := range form.Fields {
-			if f.Logic != nil && f.Logic.TargetFieldID == field.ID {
+			if f.ID == fieldID && f.Logic != nil && f.Logic.TargetFieldID == field.ID {
 				selected = true
 			}
 		}
diff --git a/ui/fields/fields_templ.go b/ui/fields/fields_templ.go
index 8dcc527..ea84992 100644
--- a/ui/fields/fields_templ.go
+++ b/ui/fields/fields_templ.go
@@ -596,7 +596,7 @@ func FieldsAsSelectorOptions(form frm.Form, fieldID uuid.UUID) (options []select
 		}
 		selected := false
 		for _, f := range form.Fields {
-			if f.Logic != nil && f.Logic.TargetFieldID == field.ID {
+			if f.ID == fieldID && f.Logic != nil && f.Logic.TargetFieldID == field.ID {
 				selected = true
 			}
 		}