diff --git a/Directory.Packages.props b/Directory.Packages.props
index b93bf060..d687a597 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaVersion>11.0.9</AvaloniaVersion>
     <ShowMeTheXamlVersion>1.4.1</ShowMeTheXamlVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Material.Styles/Themes/MaterialThemeBase.cs b/Material.Styles/Themes/MaterialThemeBase.cs
index 9060c7c9..856eb2d9 100644
--- a/Material.Styles/Themes/MaterialThemeBase.cs
+++ b/Material.Styles/Themes/MaterialThemeBase.cs
@@ -107,9 +107,7 @@ internal IResourceDictionary InternalResources {
             { "MaterialColumnHeaderBrush", theme => theme.ColumnHeader },
             { "MaterialCheckBoxOffBrush", theme => theme.CheckBoxOff },
             { "MaterialCheckBoxDisabledBrush", theme => theme.CheckBoxDisabled },
-            // Workaround for TextBlock text color does not changing: https://github.com/AvaloniaCommunity/Material.Avalonia/issues/262
-            // Comment should be removed when https://github.com/AvaloniaUI/Avalonia/issues/12408 fixed
-            // { "MaterialTextBoxBorderBrush", theme => theme.TextBoxBorder },
+            { "MaterialTextBoxBorderBrush", theme => theme.TextBoxBorder },
             { "MaterialDividerBrush", theme => theme.Divider },
             { "MaterialSelectionBrush", theme => theme.Selection },
             { "MaterialToolForegroundBrush", theme => theme.ToolForeground },