diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 5c841d19b2..090385458e 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -22,7 +22,7 @@
       "alt-cmd-right": "pane::ActivateNextItem",
       "cmd-w": "pane::CloseActiveItem",
       "alt-cmd-t": "pane::CloseInactiveItems",
-      "ctrl-alt-cmd-w": "workspace::CloseInactiveEditors",
+      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
       "cmd-k u": "pane::CloseCleanItems",
       "cmd-k cmd-w": "pane::CloseAllItems",
       "cmd-shift-w": "workspace::CloseWindow",
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 2972c307f2..ee658c9cc9 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -746,6 +746,10 @@ impl Pane {
         _: &CloseAllItems,
         cx: &mut ViewContext<Self>,
     ) -> Option<Task<Result<()>>> {
+        if self.items.is_empty() {
+            return None;
+        }
+
         Some(self.close_items(cx, move |_| true))
     }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 6694cc06a3..827b0b8427 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -21,6 +21,7 @@ use drag_and_drop::DragAndDrop;
 use futures::{
     channel::{mpsc, oneshot},
     future::try_join_all,
+    stream::FuturesUnordered,
     FutureExt, StreamExt,
 };
 use gpui::{
@@ -122,7 +123,7 @@ actions!(
         NewFile,
         NewWindow,
         CloseWindow,
-        CloseInactiveEditors,
+        CloseInactiveTabsAndPanes,
         AddFolderToProject,
         Unfollow,
         Save,
@@ -240,7 +241,7 @@ pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {
 
     cx.add_async_action(Workspace::follow_next_collaborator);
     cx.add_async_action(Workspace::close);
-    cx.add_async_action(Workspace::close_inactive_editors);
+    cx.add_async_action(Workspace::close_inactive_items_and_panes);
     cx.add_global_action(Workspace::close_global);
     cx.add_global_action(restart);
     cx.add_async_action(Workspace::save_all);
@@ -1635,32 +1636,43 @@ impl Workspace {
         }
     }
 
-    pub fn close_inactive_editors(
+    pub fn close_inactive_items_and_panes(
         &mut self,
-        _: &CloseInactiveEditors,
+        _: &CloseInactiveTabsAndPanes,
         cx: &mut ViewContext<Self>,
     ) -> Option<Task<Result<()>>> {
         let current_pane = self.active_pane();
 
-        // let mut tasks: Vec<Task<Result<()>>> = Vec::new();
-        current_pane
-            .update(cx, |pane, cx| {
-                pane.close_inactive_items(&CloseInactiveItems, cx).unwrap()
-            })
-            .detach_and_log_err(cx);
+        let mut tasks = Vec::new();
+
+        if let Some(current_pane_close) = current_pane.update(cx, |pane, cx| {
+            pane.close_inactive_items(&CloseInactiveItems, cx)
+        }) {
+            tasks.push(current_pane_close);
+        };
 
         for pane in self.panes() {
             if pane.id() == current_pane.id() {
                 continue;
             }
 
-            pane.update(cx, |pane: &mut Pane, cx| {
-                pane.close_all_items(&CloseAllItems, cx).unwrap()
-            })
-            .detach_and_log_err(cx);
+            if let Some(close_pane_items) = pane.update(cx, |pane: &mut Pane, cx| {
+                pane.close_all_items(&CloseAllItems, cx)
+            }) {
+                tasks.push(close_pane_items)
+            }
         }
 
-        Some(Task::ready(Ok(())))
+        if tasks.is_empty() {
+            None
+        } else {
+            Some(cx.spawn(|_, _| async move {
+                for task in tasks {
+                    task.await?
+                }
+                Ok(())
+            }))
+        }
     }
 
     pub fn toggle_dock(&mut self, dock_side: DockPosition, cx: &mut ViewContext<Self>) {