diff --git a/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs b/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs
index d79d65e..82a3528 100644
--- a/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs
+++ b/source/NumericUpDownLib/Base/AbstractBaseUpDown.cs
@@ -320,14 +320,25 @@ public byte DisplayLength
 		{
 			get { return (byte)GetValue(DisplayLengthProperty); }
 			set { SetValue(DisplayLengthProperty, value); }
-		}
-
-		/// <summary>
-		/// Gets/sets whether the textbox portion of the numeric up down control
-		/// can go grow and shrink with its input or whether it should stay with
-		/// a fixed width.
-		/// </summary>
-		public bool IsDisplayLengthFixed
+		}
+
+        /// <summary>
+        /// Gets/sets the MinWidth for the control. The width of the textbox portion of
+        /// the control is expanded to fill the MinWidth value while the width of the
+		/// UpDown buttons are auto sized.
+        /// </summary>
+        public virtual double MinWidth
+		{
+			get { return (double)GetValue(MinWidthProperty); }
+			set { SetValue(MinWidthProperty, value); }
+		}
+
+        /// <summary>
+        /// Gets/sets whether the textbox portion of the numeric up down control
+        /// can go grow and shrink with its input or whether it should stay with
+        /// a fixed width.
+        /// </summary>
+        public bool IsDisplayLengthFixed
 		{
 			get { return (bool)GetValue(IsDisplayLengthFixedProperty); }
 			set { SetValue(IsDisplayLengthFixedProperty, value); }
diff --git a/source/NumericUpDownLib/Base/InputBaseUpDown.xaml b/source/NumericUpDownLib/Base/InputBaseUpDown.xaml
index aa1cecc..7af4057 100644
--- a/source/NumericUpDownLib/Base/InputBaseUpDown.xaml
+++ b/source/NumericUpDownLib/Base/InputBaseUpDown.xaml
@@ -12,7 +12,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type local:InputBaseUpDown}">
 					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid VerticalAlignment="Top">
+                        <Grid VerticalAlignment="Top" MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=MinWidth}">
 							<Grid.Resources>
 								<conv:ByteToPlaceHolderStringConverter x:Key="ByteToPlaceHolderStringConverter" />
 								<conv:BoolToVisibilityPropConverter x:Key="BoolToVisibilityConverter" />
@@ -22,7 +22,7 @@
 								<RowDefinition Height="Auto" />
 							</Grid.RowDefinitions>
 							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>