diff --git a/MainDemo.Wpf/Converters/ColorToBrushConverter.cs b/MainDemo.Wpf/Converters/ColorToBrushConverter.cs
index 7052879845..3c6ac31ffd 100644
--- a/MainDemo.Wpf/Converters/ColorToBrushConverter.cs
+++ b/MainDemo.Wpf/Converters/ColorToBrushConverter.cs
@@ -7,16 +7,18 @@ namespace MaterialDesignDemo.Converters;
 [ValueConversion(typeof(Color), typeof(Brush))]
 public class ColorToBrushConverter : IValueConverter
 {
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         if (value is Color color)
         {
-            return new SolidColorBrush(color);
+            SolidColorBrush rv = new(color);
+            rv.Freeze();
+            return rv;
         }
         return Binding.DoNothing;
     }
 
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         if (value is SolidColorBrush brush)
         {
diff --git a/MainDemo.Wpf/Domain/FieldsViewModel.cs b/MainDemo.Wpf/Domain/FieldsViewModel.cs
index 699ca7f65e..414010eeec 100644
--- a/MainDemo.Wpf/Domain/FieldsViewModel.cs
+++ b/MainDemo.Wpf/Domain/FieldsViewModel.cs
@@ -1,5 +1,7 @@
-namespace MaterialDesignDemo.Domain;
+using System.Collections.ObjectModel;
+using System.Windows.Media;
 
+namespace MaterialDesignDemo.Domain;
 public class FieldsViewModel : ViewModelBase
 {
     private string? _name;
@@ -10,6 +12,12 @@ public class FieldsViewModel : ViewModelBase
     private string? _password2Validated = "pre-filled";
     private string? _text1;
     private string? _text2;
+    private ObservableCollection<string>? _autoSuggestBox1Suggestions;
+    private string? _autoSuggestBox1Text;
+    private readonly List<string>? _originalAutoSuggestBox1Suggestions;
+    private ObservableCollection<KeyValuePair<string, Color>>? _autoSuggestBox2Suggestions;
+    private string? _autoSuggestBox2Text;
+    private readonly List<KeyValuePair<string, Color>>? _originalAutoSuggestBox2Suggestions;
 
     public string? Name
     {
@@ -71,6 +79,46 @@ public string? Password2Validated
 
     public FieldsTestObject TestObject => new() { Name = "Mr. Test" };
 
+    public ObservableCollection<string>? AutoSuggestBox1Suggestions
+    {
+        get => _autoSuggestBox1Suggestions;
+        set => SetProperty(ref _autoSuggestBox1Suggestions, value);
+    }
+
+    public ObservableCollection<KeyValuePair<string, Color>>? AutoSuggestBox2Suggestions
+    {
+        get => _autoSuggestBox2Suggestions;
+        set => SetProperty(ref _autoSuggestBox2Suggestions, value);
+    }
+
+    public string? AutoSuggestBox1Text
+    {
+        get => _autoSuggestBox1Text;
+        set
+        {
+            if (SetProperty(ref _autoSuggestBox1Text, value) &&
+                _originalAutoSuggestBox1Suggestions != null && value != null)
+            {
+                var searchResult = _originalAutoSuggestBox1Suggestions.Where(x => IsMatch(x, value));
+                AutoSuggestBox1Suggestions = new ObservableCollection<string>(searchResult);
+            }
+        }
+    }
+
+    public string? AutoSuggestBox2Text
+    {
+        get => _autoSuggestBox2Text;
+        set
+        {
+            if (SetProperty(ref _autoSuggestBox2Text, value) &&
+                _originalAutoSuggestBox2Suggestions != null && value != null)
+            {
+                var searchResult = _originalAutoSuggestBox2Suggestions.Where(x => IsMatch(x.Key, value));
+                AutoSuggestBox2Suggestions = new ObservableCollection<KeyValuePair<string, Color>>(searchResult);
+            }
+        }
+    }
+
     public ICommand SetPassword1FromViewModelCommand { get; }
     public ICommand SetPassword2FromViewModelCommand { get; }
 
@@ -78,6 +126,34 @@ public FieldsViewModel()
     {
         SetPassword1FromViewModelCommand = new AnotherCommandImplementation(_ => Password1 = "Set from ViewModel!");
         SetPassword2FromViewModelCommand = new AnotherCommandImplementation(_ => Password2 = "Set from ViewModel!");
+
+        _originalAutoSuggestBox1Suggestions = new List<string>()
+            {
+                "Burger", "Fries", "Shake", "Lettuce"
+            };
+
+        _originalAutoSuggestBox2Suggestions = new List<KeyValuePair<string, Color>>(GetColors());
+
+        AutoSuggestBox1Suggestions = new ObservableCollection<string>(_originalAutoSuggestBox1Suggestions);
+    }
+
+    private static bool IsMatch(string item, string currentText)
+    {
+#if NET6_0_OR_GREATER
+        return item.Contains(currentText, StringComparison.OrdinalIgnoreCase);
+#else
+        return item.IndexOf(currentText, StringComparison.OrdinalIgnoreCase) >= 0;
+#endif
+    }
+
+    private static IEnumerable<KeyValuePair<string, Color>> GetColors()
+    {
+        return typeof(Colors)
+            .GetProperties()
+            .Where(prop =>
+                typeof(Color).IsAssignableFrom(prop.PropertyType))
+            .Select(prop =>
+                new KeyValuePair<string, Color>(prop.Name, (Color)prop.GetValue(null)!));
     }
 }
 
diff --git a/MainDemo.Wpf/Fields.xaml b/MainDemo.Wpf/Fields.xaml
index 6ee2767681..d6c74d3e0e 100644
--- a/MainDemo.Wpf/Fields.xaml
+++ b/MainDemo.Wpf/Fields.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.Fields"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
@@ -14,6 +15,8 @@
              mc:Ignorable="d">
 
   <UserControl.Resources>
+    <converters:ColorToBrushConverter x:Key="ColorToBrushConverter" />
+
     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}">
       <Setter Property="Margin" Value="0,8" />
       <Setter Property="VerticalAlignment" Value="Center" />
@@ -757,5 +760,125 @@
         </smtx:XamlDisplay>
       </StackPanel>
     </Grid>
+
+    <Grid Margin="0,48,0,0"
+          HorizontalAlignment="Left"
+          VerticalAlignment="Top">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <TextBlock Grid.Row="0"
+                 Grid.Column="0"
+                 Grid.ColumnSpan="3"
+                 Margin="0,0,0,10"
+                 VerticalAlignment="Center"
+                 Style="{StaticResource MaterialDesignHeadline5TextBlock}"
+                 Text="AutoSuggestBox" />
+      <TextBlock Grid.Row="1"
+                 Grid.Column="0"
+                 VerticalAlignment="Center"
+                 Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                 Text="Simple source list" />
+
+      <smtx:XamlDisplay Grid.Row="2"
+                        Grid.Column="0"
+                        UniqueKey="fields_autosuggestion_1">
+        <materialDesign:AutoSuggestBox VerticalAlignment="Bottom"
+                                       Suggestions="{Binding AutoSuggestBox1Suggestions}"
+                                       Text="{Binding AutoSuggestBox1Text, UpdateSourceTrigger=PropertyChanged}" />
+      </smtx:XamlDisplay>
+
+      <TextBlock Grid.Row="1"
+                 Grid.Column="1"
+                 Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                 Text="AutoSuggestBox with ItemTemplate" />
+      <smtx:XamlDisplay Grid.Row="2"
+                        Grid.Column="1"
+                        UniqueKey="fields_autosuggestion_2">
+        <materialDesign:AutoSuggestBox materialDesign:HintAssist.HelperText="Select color"
+                                       materialDesign:HintAssist.Hint="Color"
+                                       materialDesign:TextFieldAssist.HasClearButton="True"
+                                       DropDownElevation="Dp0"
+                                       Suggestions="{Binding AutoSuggestBox2Suggestions}"
+                                       Text="{Binding AutoSuggestBox2Text, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                       ValueMember="Key">
+          <materialDesign:AutoSuggestBox.ItemTemplate>
+            <DataTemplate>
+              <DockPanel>
+                <Border Width="20"
+                        Height="20"
+                        Background="{Binding Value, Converter={StaticResource ColorToBrushConverter}}"
+                        CornerRadius="10" />
+                <TextBlock Margin="10,0,0,0" Text="{Binding Key}" />
+              </DockPanel>
+            </DataTemplate>
+          </materialDesign:AutoSuggestBox.ItemTemplate>
+        </materialDesign:AutoSuggestBox>
+      </smtx:XamlDisplay>
+
+      <TextBlock Grid.Row="1"
+                 Grid.Column="2"
+                 Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                 Text="Filled AutoSuggestBox" />
+      <smtx:XamlDisplay Grid.Row="2"
+                        Grid.Column="2"
+                        UniqueKey="fields_autosuggestion_3">
+        <materialDesign:AutoSuggestBox materialDesign:HintAssist.Hint="Color"
+                                       materialDesign:TextFieldAssist.HasClearButton="True"
+                                       DropDownElevation="Dp0"
+                                       Style="{StaticResource MaterialDesignFilledAutoSuggestBox}"
+                                       Suggestions="{Binding AutoSuggestBox2Suggestions}"
+                                       Text="{Binding AutoSuggestBox2Text, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                       ValueMember="Key">
+          <materialDesign:AutoSuggestBox.ItemTemplate>
+            <DataTemplate>
+              <DockPanel>
+                <Border Width="20"
+                        Height="20"
+                        Background="{Binding Value, Converter={StaticResource ColorToBrushConverter}}"
+                        CornerRadius="10" />
+                <TextBlock Margin="10,0,0,0" Text="{Binding Key}" />
+              </DockPanel>
+            </DataTemplate>
+          </materialDesign:AutoSuggestBox.ItemTemplate>
+        </materialDesign:AutoSuggestBox>
+      </smtx:XamlDisplay>
+
+      <TextBlock Grid.Row="1"
+                 Grid.Column="2"
+                 Style="{StaticResource MaterialDesignSubtitle1TextBlock}"
+                 Text="Outlined AutoSuggestBox" />
+      <smtx:XamlDisplay Grid.Row="2"
+                        Grid.Column="2"
+                        UniqueKey="fields_autosuggestion_4">
+        <materialDesign:AutoSuggestBox materialDesign:HintAssist.Hint="Color"
+                                       materialDesign:TextFieldAssist.HasClearButton="True"
+                                       DropDownElevation="Dp0"
+                                       Style="{StaticResource MaterialDesignOutlinedAutoSuggestBox}"
+                                       Suggestions="{Binding AutoSuggestBox2Suggestions}"
+                                       Text="{Binding AutoSuggestBox2Text, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                       ValueMember="Key">
+          <materialDesign:AutoSuggestBox.ItemTemplate>
+            <DataTemplate>
+              <DockPanel>
+                <Border Width="20"
+                        Height="20"
+                        Background="{Binding Value, Converter={StaticResource ColorToBrushConverter}}"
+                        CornerRadius="10" />
+                <TextBlock Margin="10,0,0,0" Text="{Binding Key}" />
+              </DockPanel>
+            </DataTemplate>
+          </materialDesign:AutoSuggestBox.ItemTemplate>
+        </materialDesign:AutoSuggestBox>
+      </smtx:XamlDisplay>
+    </Grid>
   </StackPanel>
 </UserControl>
diff --git a/MainDemo.Wpf/Fields.xaml.cs b/MainDemo.Wpf/Fields.xaml.cs
index b4d21b8fc4..1dcaac91f9 100644
--- a/MainDemo.Wpf/Fields.xaml.cs
+++ b/MainDemo.Wpf/Fields.xaml.cs
@@ -1,4 +1,4 @@
-using System.Windows.Navigation;
+using System.Windows.Navigation;
 using MaterialDesignDemo.Domain;
 
 namespace MaterialDesignDemo;
diff --git a/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml
new file mode 100644
index 0000000000..cba573ebb8
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.AutoSuggestBoxes.AutoSuggestTextBoxWithCollectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.AutoSuggestBoxes"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type={x:Type local:AutoSuggestTextBoxWithCollectionViewViewModel}}"
+             d:DesignHeight="450" d:DesignWidth="800">
+  <!-- TODO: Selction Similar to SelectedItem="{Binding Suggestions/}" perhaps needing IsSynchronizedWithCurrentItem="True" -->
+  <StackPanel>
+    <materialDesign:AutoSuggestBox
+      materialDesign:HintAssist.HelperText="Name"
+      materialDesign:TextFieldAssist.HasClearButton="True"
+      Text="{Binding AutoSuggestText, UpdateSourceTrigger=PropertyChanged}"
+      Suggestions="{Binding Suggestions}">
+    </materialDesign:AutoSuggestBox>
+    <!--
+    <ComboBox ItemsSource="{Binding Suggestions}"
+              Margin="0,10"
+              IsSynchronizedWithCurrentItem="True"/>
+    <ListBox ItemsSource="{Binding Suggestions}"
+          IsSynchronizedWithCurrentItem="True"/>
+    -->    
+
+  </StackPanel>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml.cs b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml.cs
new file mode 100644
index 0000000000..2beb3b299b
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithCollectionView.xaml.cs
@@ -0,0 +1,63 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Data;
+
+namespace MaterialDesignThemes.UITests.Samples.AutoSuggestBoxes;
+
+/// <summary>
+/// Interaction logic for AutoSuggestTextBoxWithCollectionView.xaml
+/// </summary>
+public partial class AutoSuggestTextBoxWithCollectionView
+{
+    public AutoSuggestTextBoxWithCollectionView()
+    {
+        DataContext = new AutoSuggestTextBoxWithCollectionViewViewModel();
+        InitializeComponent();
+    }
+}
+
+public partial class AutoSuggestTextBoxWithCollectionViewViewModel : ObservableObject
+{
+    private ObservableCollection<string> BaseSuggestions { get; }
+
+    public ICollectionView Suggestions { get; }
+
+    [ObservableProperty]
+    private string? _autoSuggestText;
+
+    partial void OnAutoSuggestTextChanged(string? oldValue, string? newValue)
+    {
+        if (!string.IsNullOrWhiteSpace(newValue))
+        {
+            Suggestions.Filter = x => IsMatch((string)x, newValue);
+        }
+        else
+        {
+            Suggestions.Filter = null;
+        }
+        base.OnPropertyChanged(nameof(Suggestions));
+    }
+
+    public AutoSuggestTextBoxWithCollectionViewViewModel()
+    {
+        BaseSuggestions = new()
+        {
+            "Apples",
+            "Bananas",
+            "Beans",
+            "Mtn Dew",
+            "Orange",
+        };
+        Suggestions = CollectionViewSource.GetDefaultView(BaseSuggestions);
+    }
+
+    private static bool IsMatch(string item, string currentText)
+    {
+#if NET6_0_OR_GREATER
+        return item.Contains(currentText, StringComparison.OrdinalIgnoreCase);
+#else
+        return item.IndexOf(currentText, StringComparison.OrdinalIgnoreCase) >= 0;
+#endif
+    }
+}
diff --git a/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml
new file mode 100644
index 0000000000..e3dcbc33ca
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="MaterialDesignThemes.UITests.Samples.AutoSuggestTextBoxes.AutoSuggestTextBoxWithTemplate"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MaterialDesignThemes.UITests.Samples.AutoSuggestTextBoxes"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             d:DataContext="{d:DesignInstance Type=local:AutoSuggestTextBoxWithTemplateViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+  <!-- TODO SELECTED ITEM -->
+  <materialDesign:AutoSuggestBox
+      materialDesign:HintAssist.HelperText="Name"
+      materialDesign:TextFieldAssist.HasClearButton="True"
+      Text="{Binding AutoSuggestText, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+      Suggestions="{Binding Suggestions}"
+      ValueMember="Name"
+      DisplayMember="Name">
+  </materialDesign:AutoSuggestBox>
+</UserControl>
diff --git a/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml.cs b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml.cs
new file mode 100644
index 0000000000..7b2b91f653
--- /dev/null
+++ b/MaterialDesignThemes.UITests/Samples/AutoSuggestBoxes/AutoSuggestTextBoxWithTemplate.xaml.cs
@@ -0,0 +1,70 @@
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Google.Protobuf.WellKnownTypes;
+
+namespace MaterialDesignThemes.UITests.Samples.AutoSuggestTextBoxes;
+
+/// <summary>
+/// Interaction logic for AutoSuggestTextBoxWithTemplate.xaml
+/// </summary>
+public partial class AutoSuggestTextBoxWithTemplate
+{
+    public AutoSuggestTextBoxWithTemplate()
+    {
+        DataContext = new AutoSuggestTextBoxWithTemplateViewModel();
+        InitializeComponent();
+    }
+}
+
+public partial class AutoSuggestTextBoxWithTemplateViewModel : ObservableObject
+{
+    private List<SuggestionThing> BaseSuggestions { get; }
+
+    [ObservableProperty]
+    private ObservableCollection<SuggestionThing> _suggestions = new();
+
+    [ObservableProperty]
+    private string? _autoSuggestText;
+
+    partial void OnAutoSuggestTextChanged(string? oldValue, string? newValue)
+    {
+        if (!string.IsNullOrWhiteSpace(newValue))
+        {
+            var searchResult = BaseSuggestions.Where(x => IsMatch(x.Name, newValue));
+            Suggestions = new(searchResult);
+        }
+        else
+        {
+            Suggestions = new(BaseSuggestions);
+        }
+    }
+
+    public AutoSuggestTextBoxWithTemplateViewModel()
+    {
+        BaseSuggestions = new()
+        {
+            new("Apples"),
+            new("Bananas"),
+            new("Beans"),
+            new("Mtn Dew"),
+            new("Orange"),
+        };
+        Suggestions = new ObservableCollection<SuggestionThing>(BaseSuggestions);
+    }
+
+    private static bool IsMatch(string item, string currentText)
+    {
+#if NET6_0_OR_GREATER
+        return item.Contains(currentText, StringComparison.OrdinalIgnoreCase);
+#else
+        return item.IndexOf(currentText, StringComparison.OrdinalIgnoreCase) >= 0;
+#endif
+    }
+}
+
+public class SuggestionThing
+{
+    public string Name { get; }
+
+    public SuggestionThing(string name) => Name = name;
+}
diff --git a/MaterialDesignThemes.UITests/TestBase.cs b/MaterialDesignThemes.UITests/TestBase.cs
index 221bacd96a..e9ab630c81 100644
--- a/MaterialDesignThemes.UITests/TestBase.cs
+++ b/MaterialDesignThemes.UITests/TestBase.cs
@@ -7,11 +7,13 @@
 [assembly: GenerateHelpers(typeof(DrawerHost))]
 [assembly: GenerateHelpers(typeof(ColorPicker))]
 [assembly: GenerateHelpers(typeof(DialogHost))]
+[assembly: GenerateHelpers(typeof(AutoSuggestBox))]
 
 namespace MaterialDesignThemes.UITests;
 
 public abstract class TestBase : IAsyncLifetime
 {
+    protected bool AttachedDebugger { get; set; } = true;
     protected ITestOutputHelper Output { get; }
 
     [NotNull]
@@ -42,7 +44,7 @@ protected async Task<IVisualElement> LoadUserControl<TControl>()
     public async Task InitializeAsync() =>
         App = await XamlTest.App.StartRemote(new AppOptions
         {
-            AllowVisualStudioDebuggerAttach = true,
+            AllowVisualStudioDebuggerAttach = AttachedDebugger,
             LogMessage = Output.WriteLine
         });
     public async Task DisposeAsync() => await App.DisposeAsync();
diff --git a/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs b/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
new file mode 100644
index 0000000000..f72db3e441
--- /dev/null
+++ b/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
@@ -0,0 +1,118 @@
+using MaterialDesignThemes.UITests.Samples.AutoSuggestBoxes;
+using MaterialDesignThemes.UITests.Samples.AutoSuggestTextBoxes;
+using Xunit.Sdk;
+
+namespace MaterialDesignThemes.UITests.WPF.AutoSuggestBoxes;
+
+public class AutoSuggestBoxTests : TestBase
+{
+    public AutoSuggestBoxTests(ITestOutputHelper output)
+        : base(output)
+    {
+    }
+
+    [Fact]
+    public async Task CanFilterItems_WithSuggestionsAndDisplayMember_FiltersSuggestions()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithTemplate>()).As<AutoSuggestBox>();
+        IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
+        IVisualElement<ListBox> suggestionListBox = await popup.GetElement<ListBox>();
+
+        //Act
+        await suggestBox.MoveKeyboardFocus();
+        await suggestBox.SendInput(new KeyboardInput("B"));
+
+
+        //Assert
+        Assert.True(await suggestBox.GetIsSuggestionOpen());
+        Assert.True(await popup.GetIsOpen());
+
+        //Validates these elements are found
+        await AssertExists(suggestionListBox, "Bananas");
+        await AssertExists(suggestionListBox, "Beans");
+
+        //Validate other items are hidden
+        await AssertExists(suggestionListBox, "Apples", false);
+        await AssertExists(suggestionListBox, "Mtn Dew", false);
+        await AssertExists(suggestionListBox, "Orange", false);
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task CanChoiceItem_FromTheSuggestions_AssertTheTextUpdated()
+    {
+        await using var recorder = new TestRecorder(App);
+        
+        //Arrange
+        IVisualElement<AutoSuggestBox> suggestBox = (await LoadUserControl<AutoSuggestTextBoxWithTemplate>()).As<AutoSuggestBox>();
+        IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
+        IVisualElement<ListBox> suggestionListBox = await popup.GetElement<ListBox>();
+
+        //Act
+        await suggestBox.MoveKeyboardFocus();
+        await suggestBox.SendInput(new KeyboardInput("B"));
+
+        //Assert
+        Assert.True(await suggestBox.GetIsSuggestionOpen());
+        Assert.True(await popup.GetIsOpen());
+
+        //Choose Item from the list
+        var bananas = await suggestionListBox.GetElement<ListBoxItem>("/ListBoxItem[0]");
+        await Task.Delay(100);
+        await bananas.LeftClick();
+        var suggestBoxText = await suggestBox.GetText();
+        //Validate that the current text is the same as the selected item
+        Assert.Equal("Bananas", suggestBoxText);
+
+        recorder.Success();
+    }
+
+    [Fact]
+    public async Task CanFilterItems_WithCollectionView_FiltersSuggestions()
+    {
+        await using var recorder = new TestRecorder(App);
+
+        //Arrange
+        IVisualElement userControl = await LoadUserControl<AutoSuggestTextBoxWithCollectionView>();
+        IVisualElement<AutoSuggestBox> suggestBox = await userControl.GetElement<AutoSuggestBox>();
+        IVisualElement<Popup> popup = await suggestBox.GetElement<Popup>();
+        IVisualElement<ListBox> suggestionListBox = await popup.GetElement<ListBox>();
+
+        //Act
+        await suggestBox.MoveKeyboardFocus();
+        await suggestBox.SendInput(new KeyboardInput("B"));
+
+
+        //Assert
+        Assert.True(await suggestBox.GetIsSuggestionOpen());
+        Assert.True(await popup.GetIsOpen());
+
+        //Validates these elements are found
+        await AssertExists(suggestionListBox, "Bananas");
+        await AssertExists(suggestionListBox, "Beans");
+
+        //Validate other items are hidden
+        await AssertExists(suggestionListBox, "Apples", false);
+        await AssertExists(suggestionListBox, "Mtn Dew", false);
+        await AssertExists(suggestionListBox, "Orange", false);
+
+        recorder.Success();
+    }
+
+    private static async Task AssertExists(IVisualElement<ListBox> suggestionListBox, string text, bool existsOrNotCheck = true)
+    {
+        try
+        {
+            _ = await suggestionListBox.GetElement(ElementQuery.PropertyExpression<TextBlock>(x => x.Text, text));
+            Assert.True(existsOrNotCheck);
+        }
+        catch (Exception e) when (e is not TrueException)
+        {
+            Assert.False(existsOrNotCheck);
+        }
+    }
+}
diff --git a/MaterialDesignThemes.Wpf/AutoSuggestBox.cs b/MaterialDesignThemes.Wpf/AutoSuggestBox.cs
new file mode 100644
index 0000000000..771646a758
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/AutoSuggestBox.cs
@@ -0,0 +1,262 @@
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace MaterialDesignThemes.Wpf;
+
+[TemplatePart(Name = AutoSuggestBoxListPart, Type = typeof(ListBox))]
+public class AutoSuggestBox : TextBox
+{
+    private const string AutoSuggestBoxListPart = "PART_AutoSuggestBoxList";
+
+    #region Properties
+
+    protected ListBox? _autoSuggestBoxList;
+
+    #endregion
+
+    #region Dependency Properties
+
+    public IEnumerable Suggestions
+    {
+        get => (IEnumerable)GetValue(SuggestionsProperty);
+        set => SetValue(SuggestionsProperty, value);
+    }
+
+    public static readonly DependencyProperty SuggestionsProperty =
+        DependencyProperty.Register("Suggestions", typeof(IEnumerable), typeof(AutoSuggestBox), new PropertyMetadata(null));
+
+
+    public string ValueMember
+    {
+        get => (string)GetValue(ValueMemberProperty);
+        set => SetValue(ValueMemberProperty, value);
+    }
+    public static readonly DependencyProperty ValueMemberProperty =
+        DependencyProperty.Register("ValueMember", typeof(string), typeof(AutoSuggestBox), new PropertyMetadata(default(string)));
+
+
+    public string DisplayMember
+    {
+        get => (string)GetValue(DisplayMemberProperty);
+        set => SetValue(DisplayMemberProperty, value);
+    }
+    public static readonly DependencyProperty DisplayMemberProperty =
+        DependencyProperty.Register("DisplayMember", typeof(string), typeof(AutoSuggestBox), new PropertyMetadata(default(string)));
+
+    public Brush DropDownBackground
+    {
+        get => (Brush)GetValue(DropDownBackgroundProperty);
+        set => SetValue(DropDownBackgroundProperty, value);
+    }
+    public static readonly DependencyProperty DropDownBackgroundProperty =
+        DependencyProperty.Register("DropDownBackground", typeof(Brush), typeof(AutoSuggestBox), new PropertyMetadata(default(Brush)));
+
+    public DataTemplate ItemTemplate
+    {
+        get => (DataTemplate)GetValue(ItemTemplateProperty);
+        set => SetValue(ItemTemplateProperty, value);
+    }
+    public static readonly DependencyProperty ItemTemplateProperty =
+        DependencyProperty.Register("ItemTemplate", typeof(DataTemplate), typeof(AutoSuggestBox), new PropertyMetadata(default(DataTemplate)));
+
+    public Style ItemContainerStyle
+    {
+        get => (Style)GetValue(ItemContainerStyleProperty);
+        set => SetValue(ItemContainerStyleProperty, value);
+    }
+    public static readonly DependencyProperty ItemContainerStyleProperty =
+        DependencyProperty.Register("ItemContainerStyle", typeof(Style), typeof(AutoSuggestBox), new PropertyMetadata(default(Style)));
+
+    public Elevation DropDownElevation
+    {
+        get => (Elevation)GetValue(DropDownElevationProperty);
+        set => SetValue(DropDownElevationProperty, value);
+    }
+    public static readonly DependencyProperty DropDownElevationProperty =
+        DependencyProperty.Register("DropDownElevation", typeof(Elevation), typeof(AutoSuggestBox), new PropertyMetadata(default(Elevation)));
+
+    public double DropDownMaxHeight
+    {
+        get => (double)GetValue(DropDownMaxHeightProperty);
+        set => SetValue(DropDownMaxHeightProperty, value);
+    }
+    public static readonly DependencyProperty DropDownMaxHeightProperty =
+        DependencyProperty.Register("DropDownMaxHeight", typeof(double), typeof(AutoSuggestBox), new PropertyMetadata(200.0));
+
+
+    public bool IsSuggestionOpen
+    {
+        get => (bool)GetValue(IsSuggestionOpenProperty);
+        set => SetValue(IsSuggestionOpenProperty, value);
+    }
+    public static readonly DependencyProperty IsSuggestionOpenProperty =
+        DependencyProperty.Register("IsSuggestionOpen", typeof(bool), typeof(AutoSuggestBox), new PropertyMetadata(default(bool)));
+
+    public object SelectedItem
+    {
+        get => GetValue(SelectedItemProperty);
+        set => SetValue(SelectedItemProperty, value);
+    }
+    public static readonly DependencyProperty SelectedItemProperty =
+        DependencyProperty.Register("SelectedItem", typeof(object), typeof(AutoSuggestBox), new PropertyMetadata(default(object)));
+
+
+    public object SelectedValue
+    {
+        get => GetValue(SelectedValueProperty);
+        set => SetValue(SelectedValueProperty, value);
+    }
+    public static readonly DependencyProperty SelectedValueProperty =
+        DependencyProperty.Register("SelectedValue", typeof(object), typeof(AutoSuggestBox), new PropertyMetadata(default(object)));
+
+
+
+
+
+    public static readonly RoutedEvent SuggestionChosenEvent =
+        EventManager.RegisterRoutedEvent(
+            "SuggestionChosen",
+            RoutingStrategy.Bubble,
+            typeof(RoutedPropertyChangedEventHandler<object>),
+            typeof(AutoSuggestBox));
+
+    public event RoutedPropertyChangedEventHandler<object> SuggestionChosen
+    {
+        add => AddHandler(SuggestionChosenEvent, value);
+        remove => RemoveHandler(SuggestionChosenEvent, value);
+    }
+
+    #endregion
+
+    static AutoSuggestBox() => DefaultStyleKeyProperty.OverrideMetadata(typeof(AutoSuggestBox), new FrameworkPropertyMetadata(typeof(AutoSuggestBox)));
+
+    #region Override methods
+
+    public override void OnApplyTemplate()
+    {
+        if (GetTemplateChild(AutoSuggestBoxListPart) is ListBox listBox)
+        {
+            _autoSuggestBoxList = listBox;
+
+            listBox.PreviewMouseDown -= AutoSuggestionListBox_PreviewMouseDown;
+
+            base.OnApplyTemplate();
+
+            listBox.PreviewMouseDown += AutoSuggestionListBox_PreviewMouseDown;
+        }
+    }
+
+    protected override void OnPreviewKeyDown(KeyEventArgs e)
+    {
+        base.OnPreviewKeyDown(e);
+        if (_autoSuggestBoxList is null) return;
+        switch (e.Key)
+        {
+            case Key.Down:
+                IncrementSelection();
+                break;
+            case Key.Up:
+                DecrementSelection();
+                break;
+            case Key.Enter:
+                CommitValueSelection();
+                break;
+            case Key.Escape:
+                CloseAutoSuggestionPopUp();
+                break;
+            case Key.Tab:
+                CommitValueSelection();
+                break;
+            default:
+                return;
+        }
+        e.Handled = true;
+    }
+
+    protected override void OnLostFocus(RoutedEventArgs e)
+    {
+        base.OnLostFocus(e);
+        CloseAutoSuggestionPopUp();
+    }
+    protected override void OnTextChanged(TextChangedEventArgs e)
+    {
+        base.OnTextChanged(e);
+        if (_autoSuggestBoxList is null)
+            return;
+        if ((Text.Length == 0 || _autoSuggestBoxList.Items.Count == 0) && IsSuggestionOpen)
+            IsSuggestionOpen = false;
+        else if (Text.Length > 0 && !IsSuggestionOpen && IsFocused && _autoSuggestBoxList.Items.Count > 0)
+            IsSuggestionOpen = true;
+    }
+
+    #endregion
+
+    #region Callback handlers
+
+    private void AutoSuggestionListBox_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        if (_autoSuggestBoxList is not null && e.OriginalSource is FrameworkElement element)
+        {
+            if (!_autoSuggestBoxList.Items.Contains(element.DataContext))
+                return;
+            _autoSuggestBoxList.SelectedItem = element.DataContext;
+            CommitValueSelection();
+        }
+    }
+
+    #endregion
+
+    #region Methods    
+
+    private void CloseAutoSuggestionPopUp()
+    {
+        IsSuggestionOpen = false;
+    }
+
+    private void CommitValueSelection()
+    {
+        if (_autoSuggestBoxList?.SelectedValue is { } selectedValue)
+        {
+            var oldValue = Text;
+            Text = selectedValue.ToString();
+            if (Text != null)
+            {
+                CaretIndex = Text.Length;
+            }
+            CloseAutoSuggestionPopUp();
+            var args = new RoutedPropertyChangedEventArgs<object?>(oldValue, Text)
+            {
+                RoutedEvent = SuggestionChosenEvent
+            };
+            RaiseEvent(args);
+        }
+    }
+
+    private void DecrementSelection()
+    {
+        if (_autoSuggestBoxList is null)
+            return;
+        ICollectionView collectionView = CollectionViewSource.GetDefaultView(Suggestions);
+        if (collectionView.IsCurrentBeforeFirst)
+            collectionView.MoveCurrentToLast();
+        else
+            collectionView.MoveCurrentToPrevious();
+        _autoSuggestBoxList.ScrollIntoView(_autoSuggestBoxList.SelectedItem);
+    }
+
+    private void IncrementSelection()
+    {
+        if (_autoSuggestBoxList is null)
+            return;
+        ICollectionView collectionView = CollectionViewSource.GetDefaultView(Suggestions);
+        if (collectionView.IsCurrentAfterLast)
+            collectionView.MoveCurrentToFirst();
+        else
+            collectionView.MoveCurrentToNext();
+        _autoSuggestBoxList.ScrollIntoView(_autoSuggestBoxList.SelectedItem);
+    }
+
+    #endregion
+}
diff --git a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 5f21628593..42b98478a3 100644
--- a/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
diff --git a/MaterialDesignThemes.Wpf/TextFieldAssist.cs b/MaterialDesignThemes.Wpf/TextFieldAssist.cs
index e40bf7fb94..17e51a6e19 100644
--- a/MaterialDesignThemes.Wpf/TextFieldAssist.cs
+++ b/MaterialDesignThemes.Wpf/TextFieldAssist.cs
@@ -287,7 +287,7 @@ private static void PasswordBoxOnPasswordChanged(object sender, RoutedEventArgs
     internal static readonly DependencyProperty PasswordBoxCharacterCountProperty = DependencyProperty.RegisterAttached(
         "PasswordBoxCharacterCount", typeof(int), typeof(TextFieldAssist), new PropertyMetadata(default(int)));
     internal static void SetPasswordBoxCharacterCount(DependencyObject element, int value) => element.SetValue(PasswordBoxCharacterCountProperty, value);
-    internal static int GetPasswordBoxCharacterCount(DependencyObject element) => (int) element.GetValue(PasswordBoxCharacterCountProperty);
+    internal static int GetPasswordBoxCharacterCount(DependencyObject element) => (int)element.GetValue(PasswordBoxCharacterCountProperty);
 
     #region Methods
 
@@ -459,5 +459,5 @@ private static void TextBoxViewMarginPropertyChangedCallback(
         };
     }
 
-    #endregion
+#endregion
 }
diff --git a/MaterialDesignThemes.Wpf/Themes/Generic.xaml b/MaterialDesignThemes.Wpf/Themes/Generic.xaml
index b8a72197fb..232cbf621a 100644
--- a/MaterialDesignThemes.Wpf/Themes/Generic.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/Generic.xaml
@@ -29,6 +29,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.SmartHint.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Snackbar.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.AutoSuggestBox.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <!-- set up default styles for our custom Material Design in XAML Toolkit controls -->
@@ -37,6 +38,7 @@
   <Style TargetType="{x:Type local:Card}" BasedOn="{StaticResource MaterialDesignElevatedCard}" />
   <Style TargetType="{x:Type local:PopupBox}" BasedOn="{StaticResource MaterialDesignPopupBox}" />
   <Style TargetType="{x:Type local:TimePicker}" BasedOn="{StaticResource MaterialDesignTimePicker}" />
+  <Style TargetType="{x:Type local:AutoSuggestBox}" BasedOn="{StaticResource MaterialDesignAutoSuggestBox}" />
 
   <converters:BrushToRadialGradientBrushConverter x:Key="BrushToRadialGradientBrushConverter" />
   <converters:DrawerOffsetConverter x:Key="DrawerOffsetConverter" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
index ca689475da..4e04ccb339 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesign2.Defaults.xaml
@@ -43,6 +43,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Thumb.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Window.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.AutoSuggestBox.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <SolidColorBrush x:Key="MaterialDesignDarkSeparatorBackground" Color="#1F000000" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
index 2b79a87e63..eabab8723f 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
@@ -47,6 +47,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TreeView.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Thumb.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.AutoSuggestBox.xaml" />
 
     <!-- add MD3 toggle button last because CheckBox and ToolBar resource dictionaries import the MD2 version -->
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.ToggleButton.xaml" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
new file mode 100644
index 0000000000..c486edbc3e
--- /dev/null
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
@@ -0,0 +1,569 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
+                    xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Card.xaml" />
+  </ResourceDictionary.MergedDictionaries>
+
+  <Style x:Key="MaterialDesignAutoSuggestBoxBase"
+         TargetType="{x:Type wpf:AutoSuggestBox}"
+         BasedOn="{StaticResource MaterialDesignTextBoxBase}">
+    <Setter Property="DropDownBackground" Value="White" />
+    <Setter Property="DropDownElevation" Value="Dp2" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type wpf:AutoSuggestBox}">
+          <ControlTemplate.Resources>
+            <wpf:ElevationMarginConverter x:Key="ElevationMarginConverter" />
+            <wpf:ElevationRadiusConverter x:Key="ElevationRadiusConverter" Multiplier="-1" />
+          </ControlTemplate.Resources>
+          <Grid VerticalAlignment="Center" Cursor="{TemplateBinding Cursor, Converter={StaticResource ArrowCursorConverter}}">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="FocusStates">
+                <VisualState x:Name="Focused">
+                  <Storyboard TargetName="RippleOnFocusScaleTransform">
+                    <DoubleAnimation Storyboard.TargetProperty="ScaleX"
+                                     From="0"
+                                     To="1"
+                                     Duration="0:0:0.3">
+                      <DoubleAnimation.EasingFunction>
+                        <SineEase EasingMode="EaseOut" />
+                      </DoubleAnimation.EasingFunction>
+                    </DoubleAnimation>
+                    <DoubleAnimation Storyboard.TargetProperty="ScaleY"
+                                     From="0"
+                                     To="1"
+                                     Duration="0:0:0.3">
+                      <DoubleAnimation.EasingFunction>
+                        <SineEase EasingMode="EaseOut" />
+                      </DoubleAnimation.EasingFunction>
+                    </DoubleAnimation>
+                    <DoubleAnimation BeginTime="0:0:0.45"
+                                     Storyboard.TargetProperty="ScaleX"
+                                     To="0"
+                                     Duration="0" />
+                    <DoubleAnimation BeginTime="0:0:0.45"
+                                     Storyboard.TargetProperty="ScaleY"
+                                     To="0"
+                                     Duration="0" />
+                  </Storyboard>
+                </VisualState>
+                <VisualState x:Name="Unfocused">
+                  <Storyboard TargetName="RippleOnFocusScaleTransform">
+                    <DoubleAnimation Storyboard.TargetProperty="ScaleX"
+                                     To="0"
+                                     Duration="0" />
+                    <DoubleAnimation Storyboard.TargetProperty="ScaleY"
+                                     To="0"
+                                     Duration="0" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
+                    RenderTransformOrigin="0.5,0.5"
+                    Visibility="{TemplateBinding wpf:TextFieldAssist.RippleOnFocusEnabled, Converter={StaticResource BooleanToVisibilityConverter}}">
+              <Border.RenderTransform>
+                <ScaleTransform x:Name="RippleOnFocusScaleTransform" ScaleX="0" ScaleY="0" />
+              </Border.RenderTransform>
+            </Border>
+            <AdornerDecorator>
+              <Border x:Name="border"
+                      Padding="{TemplateBinding Padding}"
+                      wpf:BottomDashedLineAdorner.Brush="{TemplateBinding BorderBrush}"
+                      wpf:BottomDashedLineAdorner.Thickness="{TemplateBinding BorderThickness}"
+                      Background="{TemplateBinding Background}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="{TemplateBinding BorderThickness}"
+                      CornerRadius="{TemplateBinding wpf:TextFieldAssist.TextFieldCornerRadius}"
+                      SnapsToDevicePixels="True">
+                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                  <wpf:PackIcon x:Name="LeadingPackIcon"
+                                Grid.Column="0"
+                                Width="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
+                                Height="{TemplateBinding wpf:TextFieldAssist.LeadingIconSize}"
+                                Margin="0,0,6,0"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource VerticalAlignmentConverter}}"
+                                Kind="{TemplateBinding wpf:TextFieldAssist.LeadingIcon}"
+                                Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                Visibility="{TemplateBinding wpf:TextFieldAssist.HasLeadingIcon, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                  <Grid x:Name="grid"
+                        Grid.Column="1"
+                        MinWidth="1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                    <Grid Grid.Column="0">
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                      </Grid.ColumnDefinitions>
+
+                      <TextBlock x:Name="PrefixTextBlock"
+                                 Grid.Column="0"
+                                 Margin="0,0,2,0"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                 FontSize="{TemplateBinding FontSize}"
+                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                 Text="{TemplateBinding wpf:TextFieldAssist.PrefixText}">
+                        <TextBlock.Visibility>
+                          <MultiBinding Converter="{StaticResource PrefixTextVisibilityConverter}">
+                            <Binding ElementName="Hint" Path="IsHintInFloatingPosition" />
+                            <Binding Path="(wpf:TextFieldAssist.PrefixText)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          </MultiBinding>
+                        </TextBlock.Visibility>
+                      </TextBlock>
+
+                      <ScrollViewer x:Name="PART_ContentHost"
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Panel.ZIndex="1"
+                                    wpf:ScrollViewerAssist.IgnorePadding="True"
+                                    Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
+                                    Focusable="false"
+                                    HorizontalScrollBarVisibility="Hidden"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                                    VerticalScrollBarVisibility="Hidden" />
+
+                      <TextBlock x:Name="SuffixTextBlock"
+                                 Grid.Column="2"
+                                 Margin="0,0,2,0"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                 FontSize="{TemplateBinding FontSize}"
+                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                 Text="{TemplateBinding wpf:TextFieldAssist.SuffixText}"
+                                 Visibility="{TemplateBinding wpf:TextFieldAssist.SuffixText, Converter={StaticResource NullableToVisibilityConverter}}" />
+                    </Grid>
+
+                    <wpf:SmartHint x:Name="Hint"
+                                   Grid.Column="0"
+                                   VerticalAlignment="Stretch"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
+                                   FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
+                                   FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                   HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
+                                   UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}">
+                      <wpf:SmartHint.Hint>
+                        <Border x:Name="HintBackgroundBorder"
+                                Background="{TemplateBinding wpf:HintAssist.Background}"
+                                CornerRadius="2">
+                          <ContentPresenter x:Name="HintWrapper" Content="{TemplateBinding wpf:HintAssist.Hint}" />
+                        </Border>
+                      </wpf:SmartHint.Hint>
+                    </wpf:SmartHint>
+
+                  </Grid>
+
+                  <StackPanel x:Name="TrailingPanel"
+                              Grid.Column="2"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource VerticalAlignmentConverter}}"
+                              Orientation="Horizontal">
+                    <wpf:PackIcon x:Name="TrailingPackIcon"
+                                  Width="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
+                                  Height="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
+                                  Margin="4,0,0,0"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Kind="{TemplateBinding wpf:TextFieldAssist.TrailingIcon}"
+                                  Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
+                                  Visibility="{TemplateBinding wpf:TextFieldAssist.HasTrailingIcon, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                    <Button x:Name="PART_ClearButton"
+                            Height="Auto"
+                            Padding="2,0,0,0"
+                            Command="{x:Static internal:ClearText.ClearCommand}"
+                            Focusable="False"
+                            Style="{StaticResource MaterialDesignToolButton}">
+                      <Button.Visibility>
+                        <MultiBinding Converter="{StaticResource ClearButtonVisibilityConverter}">
+                          <Binding Path="(wpf:TextFieldAssist.HasClearButton)" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding ElementName="Hint" Path="IsContentNullOrEmpty" />
+                        </MultiBinding>
+                      </Button.Visibility>
+                      <wpf:PackIcon Margin="0" Kind="CloseCircle" />
+                    </Button>
+                  </StackPanel>
+                </Grid>
+              </Border>
+            </AdornerDecorator>
+            <wpf:PopupEx x:Name="PART_AutoSuggestBoxPopup"
+                         MaxHeight="{TemplateBinding DropDownMaxHeight}"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsSuggestionOpen, Mode=TwoWay}"
+                         PopupAnimation="Slide"
+                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                         StaysOpen="False"
+                         Visibility="Collapsed">
+              <wpf:Card x:Name="PopupCard"
+                        Margin="{TemplateBinding DropDownElevation, Converter={StaticResource ElevationMarginConverter}}"
+                        Background="{TemplateBinding DropDownBackground}"
+                        Foreground="{DynamicResource MaterialDesignBody}"
+                        RenderOptions.ClearTypeHint="Enabled"
+                        Style="{StaticResource MaterialDesignElevatedCard}">
+                <ListBox x:Name="PART_AutoSuggestBoxList"
+                         Width="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ActualWidth}"
+                         DisplayMemberPath="{TemplateBinding DisplayMember}"
+                         Focusable="False"
+                         IsSynchronizedWithCurrentItem="True"
+                         ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                         ItemTemplate="{TemplateBinding ItemTemplate}"
+                         ItemsSource="{TemplateBinding Suggestions}"
+                         SelectedItem="{TemplateBinding SelectedItem}"
+                         SelectedValue="{TemplateBinding SelectedValue}"
+                         SelectedValuePath="{TemplateBinding ValueMember}"
+                         Style="{DynamicResource MaterialDesignCardsListBox}" />
+              </wpf:Card>
+            </wpf:PopupEx>
+            <Border x:Name="borderUnderline"
+                    Height="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Background="{TemplateBinding BorderBrush}"
+                    CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
+                    SnapsToDevicePixels="True"
+                    Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}" />
+            <wpf:Underline x:Name="Underline"
+                           Background="{TemplateBinding wpf:TextFieldAssist.UnderlineBrush}"
+                           CornerRadius="{TemplateBinding wpf:TextFieldAssist.UnderlineCornerRadius}"
+                           Visibility="{TemplateBinding wpf:TextFieldAssist.DecorationVisibility}" />
+            <Canvas VerticalAlignment="Bottom">
+              <Grid x:Name="FooterGrid"
+                    Canvas.Top="2"
+                    Width="{Binding ActualWidth, ElementName=border}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TextBlock x:Name="HelperTextTextBlock"
+                           Margin="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"
+                           Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}" />
+                <Border x:Name="CharacterCounterContainer" Grid.Column="1">
+                  <TextBlock x:Name="CharacterCounterTextBlock" Style="{Binding Path=(wpf:TextFieldAssist.CharacterCounterStyle), RelativeSource={RelativeSource TemplatedParent}}" />
+                </Border>
+              </Grid>
+            </Canvas>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
+                <Condition Property="IsKeyboardFocused" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="Hint" Property="Foreground" Value="{Binding Path=(wpf:HintAssist.Foreground), RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="Hint" Property="FloatingOffset">
+                <Setter.Value>
+                  <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
+                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
+                  </MultiBinding>
+                </Setter.Value>
+              </Setter>
+              <Setter TargetName="grid" Property="Margin">
+                <Setter.Value>
+                  <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
+                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
+                  </MultiBinding>
+                </Setter.Value>
+              </Setter>
+            </MultiTrigger>
+
+            <!-- Icon margins adhering to VerticalContentAlignment for default/filled style -->
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Center" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="Hint" Property="InitialVerticalOffset" Value="-6" />
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleLeadingIconMarginConverterCenter}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleTrailingIconMarginConverterCenter}}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Top" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleLeadingIconMarginConverterTop}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleTrailingIconMarginConverterTop}}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Bottom" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleLeadingIconMarginConverterBottom}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource DefaultOrFilledStyleTrailingIconMarginConverterBottom}}" />
+            </MultiTrigger>
+
+            <!-- Icon margins adhering to VerticalContentAlignment for outlined style -->
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Center" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleLeadingIconMarginConverterCenter}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleTrailingIconMarginConverterCenter}}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Top" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleLeadingIconMarginConverterTop}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleTrailingIconMarginConverterTop}}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+                <Condition SourceName="LeadingPackIcon" Property="VerticalAlignment" Value="Bottom" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="LeadingPackIcon" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleLeadingIconMarginConverterBottom}}" />
+              <Setter TargetName="TrailingPanel" Property="Margin" Value="{Binding ElementName=grid, Path=Margin, Converter={StaticResource OutlinedStyleTrailingIconMarginConverterBottom}}" />
+            </MultiTrigger>
+
+            <Trigger Property="wpf:TextFieldAssist.HasFilledTextField" Value="True">
+              <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
+            </Trigger>
+            <Trigger Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True">
+              <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
+              <Setter Property="BorderThickness" Value="1" />
+              <Setter TargetName="Hint" Property="FloatingOffset">
+                <Setter.Value>
+                  <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
+                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="Padding" RelativeSource="{RelativeSource TemplatedParent}" />
+                    <Binding Path="VerticalContentAlignment" RelativeSource="{RelativeSource TemplatedParent}" />
+                  </MultiBinding>
+                </Setter.Value>
+              </Setter>
+              <Setter TargetName="Hint" Property="HintOpacity" Value="1" />
+              <Setter TargetName="HintWrapper" Property="Opacity" Value="{Binding Path=(wpf:HintAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+                <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
+                <Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="wpf:HintAssist.Background" Value="{DynamicResource MaterialDesignPaper}" />
+              <Setter TargetName="HintBackgroundBorder" Property="Padding" Value="4,0" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+                <Condition Property="wpf:HintAssist.IsFloating" Value="True" />
+                <Condition Property="IsKeyboardFocused" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="HintWrapper" Property="Opacity" Value="1" />
+            </MultiTrigger>
+            <DataTrigger Value="0">
+              <DataTrigger.Binding>
+                <PriorityBinding>
+                  <Binding FallbackValue="0"
+                           Path="MaxLength"
+                           RelativeSource="{RelativeSource Self}" />
+                  <Binding Source="0" />
+                </PriorityBinding>
+              </DataTrigger.Binding>
+              <Setter TargetName="CharacterCounterContainer" Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+
+            <!-- IsEnabled -->
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsEnabled" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsEnabled" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="PART_ClearButton" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="border" Property="wpf:BottomDashedLineAdorner.IsAttached" Value="True" />
+              <Setter TargetName="borderUnderline" Property="Height" Value="0" />
+              <Setter TargetName="grid" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsEnabled" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="PART_ClearButton" Property="Opacity" Value="1" />
+              <Setter TargetName="border" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="borderUnderline" Property="Height" Value="1" />
+              <Setter TargetName="borderUnderline" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <!-- Opacity already applied on 'border' -->
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsEnabled" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaInactiveBorder}" />
+              <Setter TargetName="HintWrapper" Property="Opacity">
+                <Setter.Value>
+                  <Binding Converter="{StaticResource MathMultiplyConverter}"
+                           ConverterParameter="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}"
+                           Path="(wpf:HintAssist.HintOpacity)"
+                           RelativeSource="{RelativeSource TemplatedParent}" />
+                </Setter.Value>
+              </Setter>
+              <Setter TargetName="PART_ClearButton" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="PART_ContentHost" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="PrefixTextBlock" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+              <Setter TargetName="SuffixTextBlock" Property="Opacity" Value="{x:Static wpf:Constants.TextBoxNotEnabledOpacity}" />
+            </MultiTrigger>
+
+            <!-- IsKeyboardFocused -->
+            <Trigger Property="IsKeyboardFocused" Value="True">
+              <Setter TargetName="Underline" Property="IsActive" Value="True" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsKeyboardFocused" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{Binding Path=(wpf:TextFieldAssist.UnderlineBrush), RelativeSource={RelativeSource Self}}" />
+              <Setter Property="BorderThickness" Value="2" />
+              <Setter TargetName="border" Property="Margin" Value="-1" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsKeyboardFocused" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="borderUnderline" Property="Height" Value="2" />
+            </MultiTrigger>
+
+            <!-- IsMouseOver -->
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.NewSpecHighlightingEnabled" Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{Binding Path=(wpf:TextFieldAssist.UnderlineBrush), RelativeSource={RelativeSource Self}}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="False" />
+                <Condition Property="wpf:TextFieldAssist.NewSpecHighlightingEnabled" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter TargetName="border" Property="BorderThickness" Value="0,0,0,2" />
+              <Setter TargetName="border" Property="Padding" Value="0,4,0,3" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxHoverBackground}" />
+              <Setter TargetName="borderUnderline" Property="Height" Value="1" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderThickness" Value="2" />
+              <Setter TargetName="border" Property="Margin" Value="-1" />
+            </MultiTrigger>
+
+            <!-- Validation.HasError -->
+            <Trigger Property="Validation.HasError" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignValidationErrorBrush}" />
+              <Setter TargetName="Underline" Property="Background" Value="{DynamicResource MaterialDesignValidationErrorBrush}" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="Validation.HasError" Value="True" />
+                <Condition Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignValidationErrorBrush}" />
+              <Setter Property="BorderThickness" Value="2" />
+              <Setter TargetName="FooterGrid" Property="Margin" Value="0,0,1,0" />
+              <Setter TargetName="border" Property="Margin" Value="-1" />
+            </MultiTrigger>
+
+            <!-- Display Shadow -->
+            <Trigger Property="DropDownElevation" Value="Dp0">
+              <Setter TargetName="PopupCard" Property="Style" Value="{StaticResource MaterialDesignOutlinedCard}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="MaterialDesignAutoSuggestBox"
+         TargetType="{x:Type wpf:AutoSuggestBox}"
+         BasedOn="{StaticResource MaterialDesignAutoSuggestBoxBase}" />
+
+  <Style x:Key="MaterialDesignFloatingHintAutoSuggestBox"
+         TargetType="{x:Type wpf:AutoSuggestBox}"
+         BasedOn="{StaticResource MaterialDesignAutoSuggestBox}">
+    <Setter Property="wpf:HintAssist.IsFloating" Value="True" />
+  </Style>
+
+  <Style x:Key="MaterialDesignFilledAutoSuggestBox"
+         TargetType="{x:Type wpf:AutoSuggestBox}"
+         BasedOn="{StaticResource MaterialDesignFloatingHintAutoSuggestBox}">
+    <Setter Property="Padding" Value="{x:Static wpf:Constants.FilledTextBoxDefaultPadding}" />
+    <Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
+    <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4" />
+    <Setter Property="wpf:TextFieldAssist.UnderlineCornerRadius" Value="0" />
+  </Style>
+
+  <Style x:Key="MaterialDesignOutlinedAutoSuggestBox"
+         TargetType="{x:Type wpf:AutoSuggestBox}"
+         BasedOn="{StaticResource MaterialDesignFloatingHintAutoSuggestBox}">
+    <Setter Property="DropDownElevation" Value="Dp0" />
+    <Setter Property="Padding" Value="{x:Static wpf:Constants.OutlinedTextBoxDefaultPadding}" />
+    <Setter Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
+    <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4" />
+  </Style>
+
+</ResourceDictionary>
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
index e21deed4b2..dac32f6d50 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml
@@ -2,7 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <!-- use this resource dictionary to set up the most common themes for standard controls -->
-
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Calendar.xaml" />
@@ -42,6 +41,7 @@
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Thumb.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml" />
     <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Window.xaml" />
+    <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.AutoSuggestBox.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
   <SolidColorBrush x:Key="MaterialDesignDarkSeparatorBackground" Color="#1F000000" />
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
index fd63482248..9728528298 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml
@@ -19,50 +19,18 @@
   <converters:CursorConverter x:Key="IBeamCursorConverter" FallbackCursor="IBeam" />
   <converters:StringLengthValueConverter x:Key="StringLengthValueConverter" />
   <converters:ThicknessCloneConverter x:Key="HelperTextMarginConverter" CloneEdges="Left" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterTop"
-                                      AdditionalOffsetTop="-2"
-                                      CloneEdges="Top"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterCenter"
-                                      AdditionalOffsetTop="-12"
-                                      CloneEdges="Top"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterBottom"
-                                      CloneEdges="Top"
-                                      FixedBottom="-2"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterTop"
-                                      AdditionalOffsetTop="-2"
-                                      CloneEdges="Top" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterCenter"
-                                      AdditionalOffsetTop="-12"
-                                      CloneEdges="Top" />
-  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterBottom"
-                                      CloneEdges="Top"
-                                      FixedBottom="-2" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterTop"
-                                      AdditionalOffsetTop="-2"
-                                      CloneEdges="Top"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterCenter"
-                                      AdditionalOffsetTop="0"
-                                      CloneEdges="Top"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterBottom"
-                                      AdditionalOffsetTop="0"
-                                      CloneEdges="Top"
-                                      FixedBottom="-2"
-                                      FixedRight="6" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterTop"
-                                      AdditionalOffsetTop="-2"
-                                      CloneEdges="Top" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterCenter"
-                                      AdditionalOffsetTop="0"
-                                      CloneEdges="Top" />
-  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterBottom"
-                                      AdditionalOffsetTop="0"
-                                      CloneEdges="Top"
-                                      FixedBottom="-2" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterTop" CloneEdges="Top" FixedRight="6" AdditionalOffsetTop="-2" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterCenter" CloneEdges="Top" FixedRight="6" AdditionalOffsetTop="-12" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleLeadingIconMarginConverterBottom" CloneEdges="Top" FixedRight="6" FixedBottom="-2" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterTop" CloneEdges="Top" AdditionalOffsetTop="-2" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterCenter" CloneEdges="Top" AdditionalOffsetTop="-12" />
+  <converters:ThicknessCloneConverter x:Key="DefaultOrFilledStyleTrailingIconMarginConverterBottom" CloneEdges="Top" FixedBottom="-2" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterTop" CloneEdges="Top" FixedRight="6" AdditionalOffsetTop="-2" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterCenter" CloneEdges="Top" FixedRight="6" AdditionalOffsetTop="0" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleLeadingIconMarginConverterBottom" CloneEdges="Top" FixedRight="6" FixedBottom="-2" AdditionalOffsetTop="0" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterTop" CloneEdges="Top" AdditionalOffsetTop="-2" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterCenter" CloneEdges="Top" AdditionalOffsetTop="0" />
+  <converters:ThicknessCloneConverter x:Key="OutlinedStyleTrailingIconMarginConverterBottom" CloneEdges="Top" FixedBottom="-2" AdditionalOffsetTop="0" />
   <wpf:VerticalAlignmentConverter x:Key="VerticalAlignmentConverter" />
   <converters:NullableToVisibilityConverter x:Key="NullableToVisibilityConverter" />
 
@@ -75,10 +43,8 @@
     <Setter Property="Text">
       <Setter.Value>
         <MultiBinding StringFormat="{}{0} / {1}">
-          <Binding Converter="{StaticResource StringLengthValueConverter}"
-                   Path="Text"
-                   RelativeSource="{RelativeSource FindAncestor,
-                                                   AncestorType=TextBoxBase}" />
+          <Binding Path="Text" Converter="{StaticResource StringLengthValueConverter}"
+                   RelativeSource="{RelativeSource FindAncestor, AncestorType=TextBoxBase}" />
           <Binding Path="MaxLength" RelativeSource="{RelativeSource FindAncestor, AncestorType=TextBoxBase}" />
         </MultiBinding>
       </Setter.Value>
@@ -195,8 +161,8 @@
                   <Grid x:Name="grid"
                         Grid.Column="1"
                         MinWidth="1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch">
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Stretch">
                     <Grid Grid.Column="0">
                       <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -221,10 +187,10 @@
 
                       <ScrollViewer x:Name="PART_ContentHost"
                                     Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="Stretch"
+                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     Panel.ZIndex="1"
                                     wpf:ScrollViewerAssist.IgnorePadding="True"
                                     Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
@@ -246,16 +212,16 @@
 
                     <wpf:SmartHint x:Name="Hint"
                                    Grid.Column="0"
-                                   VerticalAlignment="Stretch"
-                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                    FloatingOffset="{TemplateBinding wpf:HintAssist.FloatingOffset}"
                                    FloatingScale="{TemplateBinding wpf:HintAssist.FloatingScale}"
                                    FontFamily="{TemplateBinding wpf:HintAssist.FontFamily}"
                                    FontSize="{TemplateBinding FontSize}"
                                    HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                                    HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
-                                   UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}">
+                                   UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
+                                   VerticalAlignment="Stretch"
+                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}">
                       <wpf:SmartHint.Hint>
                         <Border x:Name="HintBackgroundBorder"
                                 Background="{TemplateBinding wpf:HintAssist.Background}"
@@ -267,10 +233,7 @@
 
                   </Grid>
 
-                  <StackPanel x:Name="TrailingPanel"
-                              Grid.Column="2"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource VerticalAlignmentConverter}}"
-                              Orientation="Horizontal">
+                  <StackPanel x:Name="TrailingPanel" Orientation="Horizontal" Grid.Column="2" VerticalAlignment="{TemplateBinding VerticalContentAlignment, Converter={StaticResource VerticalAlignmentConverter}}">
                     <wpf:PackIcon x:Name="TrailingPackIcon"
                                   Width="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
                                   Height="{TemplateBinding wpf:TextFieldAssist.TrailingIconSize}"
@@ -318,9 +281,8 @@
                   <ColumnDefinition />
                   <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBlock x:Name="HelperTextTextBlock"
-                           Margin="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"
-                           Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}" />
+                <TextBlock x:Name="HelperTextTextBlock" Style="{Binding Path=(wpf:HintAssist.HelperTextStyle), RelativeSource={RelativeSource TemplatedParent}}"
+                           Margin="{TemplateBinding Padding, Converter={StaticResource HelperTextMarginConverter}}"/>
                 <Border x:Name="CharacterCounterContainer" Grid.Column="1">
                   <TextBlock x:Name="CharacterCounterTextBlock" Style="{Binding Path=(wpf:TextFieldAssist.CharacterCounterStyle), RelativeSource={RelativeSource TemplatedParent}}" />
                 </Border>
@@ -344,7 +306,7 @@
               <Setter TargetName="Hint" Property="FloatingOffset">
                 <Setter.Value>
                   <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
-                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontFamily" ElementName="Hint" />
                     <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -354,7 +316,7 @@
               <Setter TargetName="grid" Property="Margin">
                 <Setter.Value>
                   <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
-                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontFamily" ElementName="Hint" />
                     <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -426,7 +388,7 @@
               <Setter TargetName="Hint" Property="FloatingOffset">
                 <Setter.Value>
                   <MultiBinding Converter="{StaticResource FloatingHintOffsetCalculationConverter}">
-                    <Binding ElementName="Hint" Path="FontFamily" />
+                    <Binding Path="FontFamily" ElementName="Hint" />
                     <Binding Path="FontSize" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingScale)" RelativeSource="{RelativeSource TemplatedParent}" />
                     <Binding Path="(wpf:HintAssist.FloatingOffset)" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -621,18 +583,18 @@
   <Style x:Key="MaterialDesignFilledTextBox"
          TargetType="{x:Type TextBox}"
          BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
-    <Setter Property="Padding" Value="{x:Static wpf:Constants.FilledTextBoxDefaultPadding}" />
     <Setter Property="wpf:TextFieldAssist.HasFilledTextField" Value="True" />
     <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4,4,0,0" />
     <Setter Property="wpf:TextFieldAssist.UnderlineCornerRadius" Value="0" />
+    <Setter Property="Padding" Value="{x:Static wpf:Constants.FilledTextBoxDefaultPadding}" />
   </Style>
 
   <Style x:Key="MaterialDesignOutlinedTextBox"
          TargetType="{x:Type TextBox}"
          BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}">
-    <Setter Property="Padding" Value="{x:Static wpf:Constants.OutlinedTextBoxDefaultPadding}" />
     <Setter Property="wpf:TextFieldAssist.HasOutlinedTextField" Value="True" />
     <Setter Property="wpf:TextFieldAssist.TextFieldCornerRadius" Value="4" />
+    <Setter Property="Padding" Value="{x:Static wpf:Constants.OutlinedTextBoxDefaultPadding}" />
   </Style>
 
 </ResourceDictionary>