diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
index 03ddd51ec7..6941391d82 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
@@ -227,6 +227,10 @@ TeamMonitorWindow::TeamMonitorWindow()
 
 	AddShortcut('T', B_COMMAND_KEY | B_OPTION_KEY,
 		new BMessage(kMsgLaunchTerminal));
+	AddShortcut('K', B_COMMAND_KEY | B_OPTION_KEY,
+		new BMessage(TM_KILL_APPLICATION));
+	AddShortcut('Q', B_COMMAND_KEY | B_OPTION_KEY,
+		new BMessage(TM_QUIT_APPLICATION));
 	AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
 
 	gLocalizedNamePreferred