diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
index 6941391d82..80984041ea 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
@@ -416,6 +416,8 @@ TeamMonitorWindow::UpdateList()
 	}
 
 	fRestartButton->SetEnabled(!desktopRunning);
+
+	fListView->MakeFocus();
 }