diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index aff5f63989..e92eddf75c 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -4640,7 +4640,10 @@ BView::DoLayout()
 void
 BView::SetToolTip(const char* text)
 {
-	SetToolTip(new BTextToolTip(text));
+	if (BTextToolTip* tip = dynamic_cast<BTextToolTip*>(fToolTip))
+		tip->SetText(text);
+	else
+		SetToolTip(new BTextToolTip(text));
 }