diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp
index c3eed734..f717bcba 100644
--- a/src/ui/TextField.cpp
+++ b/src/ui/TextField.cpp
@@ -159,7 +159,7 @@ QColor
 TextField::underlineColor() const
 {
         if (!underline_color_.isValid()) {
-                if (TextField::isValid() || !isModified())
+                if ((hasAcceptableInput() && isValid()) || !isModified())
                         return QPalette().color(QPalette::Highlight);
                 else
                         return Qt::red;