diff --git a/zed/src/project_panel.rs b/zed/src/project_panel.rs
index 06f706734602d8fede968451a6d8ea6af5c8c06b..d6830de7a3523398bb9b5ab57116015b311940d5 100644
--- a/zed/src/project_panel.rs
+++ b/zed/src/project_panel.rs
@@ -97,6 +97,7 @@ impl ProjectPanel {
                 project::Event::ActiveEntryChanged(Some((worktree_id, entry_id))) => {
                     this.expand_entry(*worktree_id, *entry_id, cx);
                     this.update_visible_entries(Some((*worktree_id, *entry_id)), cx);
+                    this.autoscroll();
                     cx.notify();
                 }
                 project::Event::WorktreeRemoved(id) => {
@@ -373,8 +374,6 @@ impl ProjectPanel {
             }
             self.visible_entries.push(visible_worktree_entries);
         }
-
-        self.autoscroll();
     }
 
     fn expand_entry(&mut self, worktree_id: usize, entry_id: usize, cx: &mut ViewContext<Self>) {