diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index a8411f5355d8..94a69b0d3805 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -474,9 +474,13 @@ impl<T: Item + 'static> Picker<T> {
                             log::info!("highlighting picker item failed");
                             return;
                         };
-                        let Some(Overlay {
-                            content: picker, ..
-                        }) = compositor.find::<Overlay<Self>>()
+                        let picker = match compositor.find::<Overlay<Self>>() {
+                            Some(Overlay { content, .. }) => Some(content),
+                            None => compositor
+                                .find::<Overlay<DynamicPicker<T>>>()
+                                .map(|overlay| &mut overlay.content.file_picker),
+                        };
+                        let Some(picker) = picker
                         else {
                             log::info!("picker closed before syntax highlighting finished");
                             return;