diff --git a/src/UI/resources/views/components/field-container.blade.php b/src/UI/resources/views/components/field-container.blade.php
index 9f39ac01e..a40a3f10a 100644
--- a/src/UI/resources/views/components/field-container.blade.php
+++ b/src/UI/resources/views/components/field-container.blade.php
@@ -1,6 +1,7 @@
 {{-- @internal --}}
 @props([
     'label' => '',
+    'formName' => '',
     'errors' => [],
     'isBeforeLabel' => false,
     'isInsideLabel' => false,
@@ -13,6 +14,7 @@
 
 <x-moonshine::form.wrapper
     label="{{ $label }}"
+    :form-name="$formName"
     :attributes="$attributes"
     :beforeLabel="$isBeforeLabel"
     :insideLabel="$isInsideLabel"
diff --git a/src/UI/resources/views/components/form/wrapper.blade.php b/src/UI/resources/views/components/form/wrapper.blade.php
index 9eded73c4..310b42ef2 100644
--- a/src/UI/resources/views/components/form/wrapper.blade.php
+++ b/src/UI/resources/views/components/form/wrapper.blade.php
@@ -1,5 +1,6 @@
 @props([
     'label' => '',
+    'formName' => '',
     'fieldErrors' => [],
     'beforeLabel' => false,
     'insideLabel' => false,
@@ -7,14 +8,14 @@
     'after',
 ])
 <div {{ $attributes->merge(['class' => 'form-group moonshine-field'])->except('required') }}
-     x-id="['input-wrapper', 'field']" :id="$id('input-wrapper')"
+     x-id="['input-wrapper', 'field-{{ $formName }}']" :id="$id('input-wrapper')"
 >
     {{ $beforeLabel && !$insideLabel ? $slot : '' }}
 
     @if($label)
         <x-moonshine::form.label
             :required="$attributes->get('required', false)"
-            ::for="$id('field')"
+            ::for="$id('field-{{ $formName }}')"
         >
             {{ $beforeLabel && $insideLabel ? $slot : '' }}
             {!! $label !!}
diff --git a/src/UI/src/Fields/FieldContainer.php b/src/UI/src/Fields/FieldContainer.php
index 76b3550f4..7b3c37d90 100644
--- a/src/UI/src/Fields/FieldContainer.php
+++ b/src/UI/src/Fields/FieldContainer.php
@@ -66,6 +66,7 @@ protected function viewData(): array
     {
         return [
             'label' => $this->field->getLabel(),
+            'formName' => $this->field->getFormName(),
 
             'errors' => data_get($this->field->getErrors(), $this->field->getNameDot()),