diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index 1e078cd281..0a833da3e8 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -258,7 +258,8 @@ TTracker::QuitRequested()
 		BContainerWindow *window = dynamic_cast<BContainerWindow *>
 			(fWindowList.ItemAt(i));
 
-		if (window && window->TargetModel() && !window->PoseView()->IsDesktopWindow()) {
+		if (window && window->Lock() && window->TargetModel()
+			&& !window->PoseView()->IsDesktopWindow()) {
 			if (window->TargetModel()->IsRoot())
 				message.AddBool("open_disks_window", true);
 			else {
@@ -294,6 +295,7 @@ TTracker::QuitRequested()
 					message.AddInt8(path.Path(), flags);
 				}
 			}	
+			window->Unlock();		
 		}
 	}
 	lock.Unlock();