diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
index 42230c6d1b30391c175401e0e0a5d0862f6e9d0c..da1b661333ff3855aff4b1103c0564af53f38a12 100644
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -17,21 +17,12 @@ use util::TryFutureExt;
 use workspace::Workspace;
 
 action!(Toggle);
-action!(ClearInvalid);
 
 const CONTEXT_LINE_COUNT: u32 = 1;
 
 pub fn init(cx: &mut MutableAppContext) {
-    cx.add_bindings([
-        Binding::new("alt-shift-D", Toggle, None),
-        Binding::new(
-            "alt-shift-C",
-            ClearInvalid,
-            Some("ProjectDiagnosticsEditor"),
-        ),
-    ]);
+    cx.add_bindings([Binding::new("alt-shift-D", Toggle, None)]);
     cx.add_action(ProjectDiagnosticsEditor::toggle);
-    cx.add_action(ProjectDiagnosticsEditor::clear_invalid);
 }
 
 type Event = editor::Event;
@@ -47,6 +38,7 @@ struct ProjectDiagnosticsEditor {
     path_states: Vec<(Arc<Path>, Vec<DiagnosticGroupState>)>,
     paths_to_update: HashMap<WorktreeId, HashSet<ProjectPath>>,
     build_settings: BuildSettings,
+    settings: watch::Receiver<workspace::Settings>,
 }
 
 struct DiagnosticGroupState {
@@ -83,11 +75,25 @@ impl View for ProjectDiagnosticsEditor {
     }
 
     fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
-        ChildView::new(self.editor.id()).boxed()
+        if self.path_states.is_empty() {
+            let theme = &self.settings.borrow().theme.project_diagnostics;
+            Label::new(
+                "No problems detected in the project".to_string(),
+                theme.empty_message.clone(),
+            )
+            .aligned()
+            .contained()
+            .with_style(theme.container)
+            .boxed()
+        } else {
+            ChildView::new(self.editor.id()).boxed()
+        }
     }
 
     fn on_focus(&mut self, cx: &mut ViewContext<Self>) {
-        cx.focus(&self.editor);
+        if !self.path_states.is_empty() {
+            cx.focus(&self.editor);
+        }
     }
 }
 
@@ -130,6 +136,7 @@ impl ProjectDiagnosticsEditor {
             excerpts,
             editor,
             build_settings,
+            settings,
             path_states: Default::default(),
             paths_to_update: Default::default(),
         };
@@ -147,38 +154,6 @@ impl ProjectDiagnosticsEditor {
         workspace.add_item(diagnostics, cx);
     }
 
-    fn clear_invalid(&mut self, _: &ClearInvalid, cx: &mut ViewContext<Self>) {
-        let mut blocks_to_delete = HashSet::default();
-        let mut excerpts_to_delete = Vec::new();
-        let mut path_ixs_to_delete = Vec::new();
-        for (ix, (_, groups)) in self.path_states.iter_mut().enumerate() {
-            groups.retain(|group| {
-                if group.is_valid {
-                    true
-                } else {
-                    blocks_to_delete.extend(group.blocks.keys().copied());
-                    excerpts_to_delete.extend(group.excerpts.iter().cloned());
-                    false
-                }
-            });
-
-            if groups.is_empty() {
-                path_ixs_to_delete.push(ix);
-            }
-        }
-
-        for ix in path_ixs_to_delete.into_iter().rev() {
-            self.path_states.remove(ix);
-        }
-
-        self.excerpts.update(cx, |excerpts, cx| {
-            excerpts_to_delete.sort_unstable();
-            excerpts.remove_excerpts(&excerpts_to_delete, cx)
-        });
-        self.editor
-            .update(cx, |editor, cx| editor.remove_blocks(blocks_to_delete, cx));
-    }
-
     fn update_excerpts(&self, paths: HashSet<ProjectPath>, cx: &mut ViewContext<Self>) {
         let project = self.project.clone();
         cx.spawn(|this, mut cx| {
@@ -488,6 +463,9 @@ impl ProjectDiagnosticsEditor {
             self.path_states.remove(path_ix);
         }
 
+        if self.editor.is_focused(cx) && self.path_states.is_empty() {
+            cx.focus_self();
+        }
         cx.notify();
     }
 }
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 6fca6966896c2290f2bc2ed2a7c69b15ec50b872..6a67789afe114e2b19c288259ba08ed5c7a099f4 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -24,6 +24,7 @@ pub struct Theme {
     pub project_panel: ProjectPanel,
     pub selector: Selector,
     pub editor: EditorStyle,
+    pub project_diagnostics: ProjectDiagnostics,
 }
 
 #[derive(Deserialize, Default)]
@@ -226,6 +227,13 @@ pub struct ContainedLabel {
     pub label: LabelStyle,
 }
 
+#[derive(Clone, Deserialize, Default)]
+pub struct ProjectDiagnostics {
+    #[serde(flatten)]
+    pub container: ContainerStyle,
+    pub empty_message: TextStyle,
+}
+
 #[derive(Clone, Deserialize, Default)]
 pub struct EditorStyle {
     pub text: TextStyle,
diff --git a/crates/zed/assets/themes/_base.toml b/crates/zed/assets/themes/_base.toml
index 958620521d8e9048feea444275fb79ec101f0cf5..4063fc92f95a7c95351af9eafb69ab78c0dc7d85 100644
--- a/crates/zed/assets/themes/_base.toml
+++ b/crates/zed/assets/themes/_base.toml
@@ -257,3 +257,7 @@ information_diagnostic = { text = "$status.info" }
 invalid_information_diagnostic = { text = "$text.3.color" }
 hint_diagnostic = { text = "$status.info" }
 invalid_hint_diagnostic = { text = "$text.3.color" }
+
+[project_diagnostics]
+background = "$surface.1"
+empty_message = "$text.0"