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 61636f8531..e4363313d2 100644
--- a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
@@ -218,20 +218,26 @@ TeamWindow::MessageReceived(BMessage* message)
 		{
 			if (fInspectorWindow) {
 				fInspectorWindow->Activate(true);
-				break;
+			} else {
+				try {
+					fInspectorWindow = InspectorWindow::Create(fTeam,
+						fListener, this);
+					if (fInspectorWindow != NULL) {
+						BMessage settings;
+						fInspectorWindow->LoadSettings(fUISettings);
+						fInspectorWindow->Show();
+					}
+	           	} catch (...) {
+	           		// TODO: notify user
+	           	}
 			}
 
-			try {
-				fInspectorWindow = InspectorWindow::Create(fTeam, fListener,
-					this);
-				if (fInspectorWindow != NULL) {
-					BMessage settings;
-					fInspectorWindow->LoadSettings(fUISettings);
-					fInspectorWindow->Show();
-				}
-           	} catch (...) {
-           		// TODO: notify user
-           	}
+			target_addr_t address;
+			if (message->FindUInt64("address", &address) == B_OK) {
+				BMessage addressMessage(MSG_INSPECT_ADDRESS);
+				addressMessage.AddUInt64("address", address);
+				fInspectorWindow->PostMessage(&addressMessage);
+			}
            	break;
 		}
 		case MSG_INSPECTOR_WINDOW_CLOSED: