diff --git a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
index de8cda1b5a..6bab5d7e9a 100644
--- a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2009-2012, Ingo Weinhold, ingo_weinhold@gmx.de.
- * Copyright 2010-2013, Rene Gollent, rene@gollent.com.
+ * Copyright 2010-2014, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 
@@ -151,6 +151,11 @@ TeamWindow::~TeamWindow()
 		fStackTraceView->UnsetListener();
 	if (fSourceView != NULL)
 		fSourceView->UnsetListener();
+	if (fInspectorWindow != NULL) {
+		BMessenger messenger(fInspectorWindow);
+		if (messenger.LockTarget())
+			fInspectorWindow->Quit();
+	}
 
 	fTeam->RemoveListener(this);