diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e972e2c..f90ca5e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ FlatLaf Change Log
 
 #### Fixed bugs
 
+- TextComponents: Fixed text color of disabled text components in dark themes.
 - Custom window decorations: Fixed wrong window placement when moving window to
   another screen with different scaling factor. (issue #166)
 - Custom window decorations: Fixed wrong window bounds when resizing window to
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
index b62d2437..743a82e9 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
@@ -48,7 +48,7 @@
 *.foreground=@foreground
 *.caretForeground=@foreground
 *.inactiveBackground=@background
-*.inactiveForeground=@foreground
+*.inactiveForeground=@disabledText
 *.selectionBackground=@selectionBackground
 *.selectionForeground=@selectionForeground
 *.disabledBackground=@background
diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
index 05c66959..c8fed886 100644
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
@@ -270,7 +270,7 @@ EditorPane.disabledBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-EditorPane.inactiveForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+EditorPane.inactiveForeground  #777777    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.margin              2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 EditorPane.selectionBackground #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.selectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -309,7 +309,7 @@ FormattedTextField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResourc
 FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-FormattedTextField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+FormattedTextField.inactiveForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.margin      2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 FormattedTextField.placeholderForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.selectionBackground #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
@@ -647,7 +647,7 @@ PasswordField.echoChar         '\u2022'
 PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.inactiveForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.margin           2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 PasswordField.placeholderForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.selectionBackground #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
@@ -1014,7 +1014,7 @@ TextArea.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextArea.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+TextArea.inactiveForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
 TextArea.margin                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 TextArea.selectionBackground   #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
 TextArea.selectionForeground   #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -1039,7 +1039,7 @@ TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #242424    javax.swing.plaf.ColorUIResource [UI]
 TextField.inactiveBackground   #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextField.inactiveForeground   #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+TextField.inactiveForeground   #777777    javax.swing.plaf.ColorUIResource [UI]
 TextField.light                #313131    javax.swing.plaf.ColorUIResource [UI]
 TextField.margin               2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 TextField.placeholderForeground #777777    javax.swing.plaf.ColorUIResource [UI]
@@ -1059,7 +1059,7 @@ TextPane.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextPane.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+TextPane.inactiveForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
 TextPane.margin                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 TextPane.selectionBackground   #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
 TextPane.selectionForeground   #bbbbbb    javax.swing.plaf.ColorUIResource [UI]