diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp
index 0ea26357d6..34fbe68928 100644
--- a/src/kits/interface/ScrollBar.cpp
+++ b/src/kits/interface/ScrollBar.cpp
@@ -253,11 +253,15 @@ BScrollBar::BScrollBar(BMessage *archive)
 
 BScrollBar::~BScrollBar()
 {
+	if (fTarget) {
+		if (Orientation() == B_VERTICAL)
+			fTarget->fVerScroller = NULL;
+		else
+			fTarget->fHorScroller = NULL;
+	}
+	
 	delete fPrivateData;
 	free(fTargetName);
-
-	if (fTarget)
-		fTarget->UnsetScroller(this);
 }