diff --git a/src/apps/debugger/controllers/TeamDebugger.cpp b/src/apps/debugger/controllers/TeamDebugger.cpp
index 03c4f2c782..9c334dca7d 100644
--- a/src/apps/debugger/controllers/TeamDebugger.cpp
+++ b/src/apps/debugger/controllers/TeamDebugger.cpp
@@ -736,6 +736,7 @@ TeamDebugger::MessageReceived(BMessage* message)
 			if (fCommandLineArgc == 0)
 				break;
 
+			_SaveSettings();
 			fListener->TeamDebuggerRestartRequested(this);
 			break;
 		}
@@ -1270,6 +1271,8 @@ bool
 TeamDebugger::_HandleTeamDeleted(TeamDeletedEvent* event)
 {
 	char message[64];
+	fDebuggerInterface->Close(false);
+
 	snprintf(message, sizeof(message), "Team %" B_PRId32 " has terminated. ",
 		event->Team());