diff --git a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
index 5d2893258d..5dbb1083aa 100644
--- a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
@@ -52,6 +52,11 @@ InspectorWindow::InspectorWindow(::Team* team, UserInterfaceListener* listener,
 
 InspectorWindow::~InspectorWindow()
 {
+	if (fCurrentBlock != NULL)
+	{
+		fCurrentBlock->RemoveListener(this);
+		fCurrentBlock->ReleaseReference();
+	}
 }