diff --git a/packages/dropdown_button2/CHANGELOG.md b/packages/dropdown_button2/CHANGELOG.md
index 4c1acaf..c2e789e 100644
--- a/packages/dropdown_button2/CHANGELOG.md
+++ b/packages/dropdown_button2/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Use decoration hint text as the default value for dropdown button hints [Flutter core].
 - Update SDK constraints: ">=3.4.0 <4.0.0"
 - Fix DropdownButtonFormField clips text when large text scale is used [Flutter core].
+- Fix DropdownButtonFormField padding when ButtonTheme.alignedDropdown is true [Flutter core].
 
 ## 3.0.0-beta.21
 
diff --git a/packages/dropdown_button2/lib/src/dropdown_button2.dart b/packages/dropdown_button2/lib/src/dropdown_button2.dart
index 5b7779e..cdc8313 100644
--- a/packages/dropdown_button2/lib/src/dropdown_button2.dart
+++ b/packages/dropdown_button2/lib/src/dropdown_button2.dart
@@ -725,7 +725,9 @@ class _DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBin
     }
 
     final EdgeInsetsGeometry padding =
-        ButtonTheme.of(context).alignedDropdown ? _kAlignedButtonPadding : _kUnalignedButtonPadding;
+        ButtonTheme.of(context).alignedDropdown && widget._inputDecoration == null
+            ? _kAlignedButtonPadding
+            : _kUnalignedButtonPadding;
 
     final buttonHeight = _buttonStyle?.height ?? (widget.isDense ? _denseButtonHeight : null);