diff --git a/lib/src/widgets/toolbar/quill_font_family_button.dart b/lib/src/widgets/toolbar/quill_font_family_button.dart
index eab1d972..f896e438 100644
--- a/lib/src/widgets/toolbar/quill_font_family_button.dart
+++ b/lib/src/widgets/toolbar/quill_font_family_button.dart
@@ -25,7 +25,6 @@ class QuillFontFamilyButton extends StatefulWidget {
     this.style,
     this.width,
     this.renderFontFamilies = true,
-    this.alignment,
     this.initialValue,
     this.labelOverflow = TextOverflow.visible,
     this.overrideTooltipByFontFamily = false,
@@ -53,7 +52,6 @@ class QuillFontFamilyButton extends StatefulWidget {
   final TextStyle? style;
   final double? width;
   final bool renderFontFamilies;
-  final AlignmentGeometry? alignment;
   final String? initialValue;
   final TextOverflow labelOverflow;
   final bool overrideTooltipByFontFamily;
@@ -201,13 +199,16 @@ class _QuillFontFamilyButtonState extends State<QuillFontFamilyButton> {
 
   Widget _buildContent(BuildContext context) {
     final theme = Theme.of(context);
-    return Container(
-      alignment: widget.alignment ?? Alignment.center,
+    final hasFinalWidth = widget.width != null;
+    return Padding(
       padding: widget.padding ?? const EdgeInsets.fromLTRB(10, 0, 0, 0),
       child: Row(
+        mainAxisSize: !hasFinalWidth ? MainAxisSize.min : MainAxisSize.max,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Expanded(
+          UtilityWidgets.maybeWidget(
+            enabled: hasFinalWidth,
+            wrapper: (child) => Expanded(child: child),
             child: Text(
               _currentValue,
               maxLines: 1,
diff --git a/lib/src/widgets/toolbar/quill_font_size_button.dart b/lib/src/widgets/toolbar/quill_font_size_button.dart
index 2a582fa0..bcd58e1b 100644
--- a/lib/src/widgets/toolbar/quill_font_size_button.dart
+++ b/lib/src/widgets/toolbar/quill_font_size_button.dart
@@ -26,7 +26,6 @@ class QuillFontSizeButton extends StatefulWidget {
     this.style,
     this.width,
     this.initialValue,
-    this.alignment,
     this.labelOverflow = TextOverflow.visible,
     this.itemHeight,
     this.itemPadding,
@@ -52,7 +51,6 @@ class QuillFontSizeButton extends StatefulWidget {
   final TextStyle? style;
   final double? width;
   final String? initialValue;
-  final AlignmentGeometry? alignment;
   final TextOverflow labelOverflow;
   final double? itemHeight;
   final EdgeInsets? itemPadding;
@@ -186,13 +184,16 @@ class _QuillFontSizeButtonState extends State<QuillFontSizeButton> {
 
   Widget _buildContent(BuildContext context) {
     final theme = Theme.of(context);
-    return Container(
-      alignment: widget.alignment ?? Alignment.center,
+    final hasFinalWidth = widget.width != null;
+    return Padding(
       padding: widget.padding ?? const EdgeInsets.fromLTRB(10, 0, 0, 0),
       child: Row(
+        mainAxisSize: !hasFinalWidth ? MainAxisSize.min : MainAxisSize.max,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Expanded(
+          UtilityWidgets.maybeWidget(
+            enabled: hasFinalWidth,
+            wrapper: (child) => Expanded(child: child),
             child: Text(_currentValue,
                 overflow: widget.labelOverflow,
                 style: widget.style ??