diff --git a/Applications/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h
index 3c082ff36e..5210eabb1e 100644
--- a/Applications/FileManager/DirectoryView.h
+++ b/Applications/FileManager/DirectoryView.h
@@ -34,6 +34,25 @@ public:
     void set_view_mode(ViewMode);
     ViewMode view_mode() const { return m_view_mode; }
 
+    const GAbstractView& current_view() const
+    {
+        switch (m_view_mode) {
+        case ViewMode::List:
+            return *m_table_view;
+        case ViewMode::Icon:
+            return *m_item_view;
+        default:
+            ASSERT_NOT_REACHED();
+        }
+    }
+
+    template<typename Callback>
+    void for_each_view_implementation(Callback callback)
+    {
+        callback(*m_table_view);
+        callback(*m_item_view);
+    }
+
 private:
     GDirectoryModel& model() { return *m_model; }
     const GDirectoryModel& model() const { return *m_model; }
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index b495f3bcb7..7bba76f129 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -197,8 +197,11 @@ int main(int argc, char** argv)
     directory_view->on_path_change = [window, location_textbox, &file_system_model, tree_view, &go_forward_action, &go_back_action, directory_view](const String& new_path) {
         window->set_title(String::format("File Manager: %s", new_path.characters()));
         location_textbox->set_text(new_path);
-        file_system_model->set_selected_index(file_system_model->index(new_path));
-        tree_view->scroll_into_view(file_system_model->selected_index(), Orientation::Vertical);
+        auto new_index = file_system_model->index(new_path);
+        directory_view->for_each_view_implementation([&](auto& view) {
+            view.selection().set(new_index);
+        });
+        tree_view->scroll_into_view(directory_view->current_view().selection().first(), Orientation::Vertical);
         tree_view->update();
 
         go_forward_action->set_enabled(directory_view->path_history_position()