diff --git a/src/kits/interface/BTextView/TextView.cpp b/src/kits/interface/BTextView/TextView.cpp
index 5ff476b546..fe187dcfe8 100644
--- a/src/kits/interface/BTextView/TextView.cpp
+++ b/src/kits/interface/BTextView/TextView.cpp
@@ -2152,7 +2152,12 @@ BTextView::MakeEditable(bool editable)
 		return;
 		
 	fEditable = editable;
-	
+	// TextControls change the color of the text when
+	// they are made editable, so we need to invalidate
+	// the NULL style here
+	// TODO: it works well, but it could be caused by a bug somewhere else
+	if (fEditable)
+		fStyles->InvalidateNullStyle();
 	if (Window() != NULL && fActive) {	
 		if (!fEditable) {
 			if (fCaretVisible)