diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
index a85dd3ed4cc..c6f2b84f1b5 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/ButtonDarkModeAdapter.cs
@@ -29,17 +29,12 @@ private Color GetButtonTextColor(IDeviceContext deviceContext, PushButtonState s
     {
         Color textColor;
 
-        if (Control.ForeColor != Forms.Control.DefaultForeColor)
+        if (Control.ShouldSerializeForeColor())
         {
             textColor = new ColorOptions(deviceContext, Control.ForeColor, Control.BackColor)
             {
                 Enabled = Control.Enabled
             }.Calculate().WindowText;
-
-            if (IsHighContrastHighlighted())
-            {
-                textColor = SystemColors.HighlightText;
-            }
         }
         else
         {
@@ -53,14 +48,9 @@ private Color GetButtonBackColor(PushButtonState state)
     {
         Color backColor;
 
-        if (Control.BackColor != Forms.Control.DefaultBackColor)
+        if (!Control.UseVisualStyleBackColor || Control.ShouldSerializeBackColor())
         {
             backColor = Control.BackColor;
-
-            if (IsHighContrastHighlighted())
-            {
-                backColor = SystemColors.HighlightText;
-            }
         }
         else
         {