1 files changed, 8 insertions, 1 deletions
diff --git a/src/client/shell/aggregate_navigation.rs b/src/client/shell/aggregate_navigation.rs
index b1a4d35f..67753e8e 100644
--- a/src/client/shell/aggregate_navigation.rs
+++ b/src/client/shell/aggregate_navigation.rs
@@ -288,7 +288,14 @@ pub(super) fn navigator_rows(
         Some(ClientNavigatorFilter::Done) => status == crate::api::schema::AgentStatus::Done,
         None => true,
     };
-    let text = |value: &str| query.is_empty() || value.to_lowercase().contains(&query);
+    let words = query.split_whitespace().collect::<Vec<_>>();
+    let text = |value: &str| {
+        if words.is_empty() {
+            return true;
+        }
+        let value = value.to_lowercase();
+        words.iter().all(|word| value.contains(word))
+    };
     let filtering = navigator.filter.is_some() || !query.is_empty();
     let federated = endpoints.len() > 1;
     let depth_offset = u8::from(federated);