diff --git a/skins/fluent2/QskFluent2Skin.cpp b/skins/fluent2/QskFluent2Skin.cpp
index 58ea443d..481a70d7 100644
--- a/skins/fluent2/QskFluent2Skin.cpp
+++ b/skins/fluent2/QskFluent2Skin.cpp
@@ -1589,14 +1589,7 @@ void Editor::setupTextInputColors(
     {
         QRgb panelColor = Qt::black, borderColor1 = Qt::black, borderColor2 = Qt::black, textColor = Qt::black;
 
-        if ( state == A::NoState )
-        {
-            panelColor = pal.fillColor.control.defaultColor;
-            borderColor1 = pal.elevation.textControl.border[0];
-            borderColor2 = pal.elevation.textControl.border[1];
-            textColor = pal.fillColor.text.secondary;
-        }
-        else if ( state == Q::Disabled )
+        if ( state == Q::Disabled )
         {
             panelColor = pal.fillColor.control.secondary;
             borderColor1 = pal.elevation.textControl.border[0];
@@ -1616,6 +1609,13 @@ void Editor::setupTextInputColors(
             borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
             textColor = pal.fillColor.text.disabled;
         }
+        else
+        {
+            panelColor = pal.fillColor.control.defaultColor;
+            borderColor1 = pal.elevation.textControl.border[0];
+            borderColor2 = pal.elevation.textControl.border[1];
+            textColor = pal.fillColor.text.secondary;
+        }
 
         const auto panel = Q::Panel | section | state;
         const auto text = Q::Text | section | state;