diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp
index c7e37b6348..80f67c3f04 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -310,8 +310,10 @@ BTextControl::SetText(const char *text)
 
 	fText->SetText(text);
 
-	if (IsFocus())
+	if (fText->IsFocus()) {
 		fText->SetInitialText();
+		fText->SelectAll();
+	}
 
 	fText->Invalidate();
 }