diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 5472778e66..eb07f0f64b 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -704,9 +704,6 @@ BView::~BView()
 			"Call RemoveSelf first.");
 	}
 
-	if (fToolTip != NULL)
-		fToolTip->ReleaseReference();
-
 	// we also delete all our children
 
 	BView* child = fFirstChild;
@@ -724,9 +721,12 @@ BView::~BView()
 
 	_RemoveSelf();
 
-	if (fVerScroller)
+	if (fToolTip != NULL)
+		fToolTip->ReleaseReference();
+
+	if (fVerScroller != NULL)
 		fVerScroller->SetTarget((BView*)NULL);
-	if (fHorScroller)
+	if (fHorScroller != NULL)
 		fHorScroller->SetTarget((BView*)NULL);
 
 	SetName(NULL);