diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile
index 25c70d83e2..6f4f9a179f 100644
--- a/src/kits/interface/Jamfile
+++ b/src/kits/interface/Jamfile
@@ -25,7 +25,7 @@ if ! $(HAIKU_COMPATIBLE) {
 
 SetSubDirSupportedPlatforms haiku libbe_test ;
 
-UsePrivateHeaders shared app interface input ;
+UsePrivateHeaders app input interface shared tracker ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) BTextView ] ;
 
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index affd35d1f5..395dfd5615 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -30,6 +30,7 @@
 #include <PortLink.h>
 #include <ServerProtocol.h>
 #include <TokenSpace.h>
+#include <tracker_private.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -2807,6 +2808,20 @@ BWindow::_HandleKeyDown(char key, uint32 modifiers)
 		return true;
 	}
 
+	// Deskbar's Switcher
+	if (key == B_TAB && (modifiers & B_CONTROL_KEY) != 0) {
+		BMessenger deskbar(kDeskbarSignature);
+		if (deskbar.IsValid()) {
+			BMessage message('TASK');
+			message.AddInt32("key", B_TAB);
+			message.AddInt32("modifiers", modifiers);
+			message.AddInt64("when", system_time());
+			message.AddInt32("team", Team());
+			deskbar.SendMessage(&message);
+		}
+		return true;
+	}
+
 	// Handle shortcuts
 	if ((modifiers & B_COMMAND_KEY) != 0) {
 		// Command+q has been pressed, so, we will quit