diff --git a/src/kits/tracker/Commands.h b/src/kits/tracker/Commands.h
index 698118b249..91aac36756 100644
--- a/src/kits/tracker/Commands.h
+++ b/src/kits/tracker/Commands.h
@@ -50,6 +50,7 @@ const uint32 kOpenSelection = 'Tosl';
 const uint32 kOpenSelectionWith = 'Tosu';
 const uint32 kCloseAllWindows = 'Tall';
 const uint32 kCloseWindowAndChildren = 'Tcwc';
+const uint32 kCloseAllInWorkspace = 'Tciw';
 
 // end external app messages
 
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 0ef1dd9f2e..9eb51e92eb 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1784,9 +1784,9 @@ BContainerWindow::SetCloseItem(BMenu *menu)
 		&& (item = menu->FindItem(kCloseAllWindows)) == NULL)
 		return;
 
-	if (modifiers() & B_OPTION_KEY) {
+	if (modifiers() & B_SHIFT_KEY) {
 		item->SetLabel("Close All");
-		item->SetShortcut('W', B_COMMAND_KEY | B_OPTION_KEY);
+		item->SetShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY);
 		item->SetTarget(be_app);
 		item->SetMessage(new BMessage(kCloseAllWindows));
 	} else {
@@ -1970,8 +1970,8 @@ BContainerWindow::AddWindowMenu(BMenu *menu)
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
-	item = new BMenuItem("Select"B_UTF8_ELLIPSIS, new BMessage(kShowSelectionWindow),
-		'A', B_SHIFT_KEY);
+	item = new BMenuItem("Select"B_UTF8_ELLIPSIS,
+		new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
@@ -1979,7 +1979,8 @@ BContainerWindow::AddWindowMenu(BMenu *menu)
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
-	item = new BMenuItem("Invert Selection", new BMessage(kInvertSelection), 'S');
+	item = new BMenuItem("Invert Selection", new BMessage(kInvertSelection),
+		'S');
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
@@ -1994,9 +1995,15 @@ BContainerWindow::AddWindowMenu(BMenu *menu)
 	item->SetTarget(this);
 	menu->AddItem(item);
 
+	item = new BMenuItem("Close All in Workspace",
+		new BMessage(kCloseAllInWorkspace), 'Q');
+	item->SetTarget(be_app);
+	menu->AddItem(item);
+
 	menu->AddSeparatorItem();
 
-	item = new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(kShowSettingsWindow));
+	item = new BMenuItem("Preferences"B_UTF8_ELLIPSIS,
+		new BMessage(kShowSettingsWindow));
 	item->SetTarget(be_app);
 	menu->AddItem(item);
 }
diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index e4863987ed..36bc458d19 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -402,6 +402,10 @@ TTracker::MessageReceived(BMessage *message)
 			CloseAllWindows();
 			break;
 
+		case kCloseAllInWorkspace:
+			CloseAllInWorkspace();
+			break;
+
 		case kFindButton:
 			(new FindWindow())->Show();
 			break;
@@ -854,7 +858,6 @@ TTracker::ArgvReceived(int32 argc, char **argv)
 	}
 }
 
-
 void
 TTracker::OpenContainerWindow(Model *model, BMessage *originalRefsList,
 	OpenSelector openSelector, uint32 openFlags, bool checkAlreadyOpen,
@@ -1189,6 +1192,24 @@ TTracker::CloseWindowAndChildren(const node_ref *node)
 }
 
 
+void
+TTracker::CloseAllInWorkspace()
+{
+	AutoLock<WindowList> lock(&fWindowList);
+
+	int32 currentWorkspace = 1 << current_workspace();
+	// count from end to beginning so we can remove items safely
+	for (int32 index = fWindowList.CountItems() - 1; index >= 0; index--) {
+		BWindow *window = fWindowList.ItemAt(index);
+		if (window->Workspaces() & currentWorkspace)
+			// avoid the desktop
+			if (!dynamic_cast<BDeskWindow *>(window) 
+				&& !dynamic_cast<BStatusWindow *>(window))
+				window->PostMessage(B_QUIT_REQUESTED);
+	}	
+}	
+
+
 void
 TTracker::CloseAllWindows()
 {
diff --git a/src/kits/tracker/Tracker.h b/src/kits/tracker/Tracker.h
index c4f5eac148..2269fb1e6f 100644
--- a/src/kits/tracker/Tracker.h
+++ b/src/kits/tracker/Tracker.h
@@ -192,6 +192,7 @@ class TTracker : public BApplication {
 
 		void CloseAllWindows();
 		void CloseWindowAndChildren(const node_ref *);
+		void CloseAllInWorkspace();
 		void OpenInfoWindows(BMessage*);
 		void MoveRefsToTrash(const BMessage *);
 		void OpenContainerWindow(Model *, BMessage *refsList = NULL,