diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8950604..69f8d210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.4
+
+- Fix double padding on form fields.
+
 ## 0.5.3
 
 - Update dependencies
diff --git a/lib/src/components/form/field.dart b/lib/src/components/form/field.dart
index 6cf7dac6..b5041be7 100644
--- a/lib/src/components/form/field.dart
+++ b/lib/src/components/form/field.dart
@@ -32,7 +32,9 @@ class ShadFormBuilderField<T> extends FormField<T> {
                 hasError ? error ?? Text(field.errorText!) : null;
 
             return ShadDecorator(
-              decoration: decoration,
+              // The decoration is set to none because the component itself has
+              // its own decoration
+              decoration: ShadDecoration.none,
               label: label,
               hasError: hasError,
               error: effectiveError,
diff --git a/pubspec.yaml b/pubspec.yaml
index 1014b320..7593ebbc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: shadcn_ui
 description: shadcn-ui ported in Flutter. Awesome UI components for Flutter, fully customizable.
-version: 0.5.3
+version: 0.5.4
 homepage: https://mariuti.com/shadcn-ui
 repository: https://github.com/nank1ro/flutter-shadcn-ui
 documentation: https://mariuti.com/shadcn-ui