diff --git a/Libraries/LibGUI/GAbstractView.cpp b/Libraries/LibGUI/GAbstractView.cpp
index 790554cb13..19c6cb9234 100644
--- a/Libraries/LibGUI/GAbstractView.cpp
+++ b/Libraries/LibGUI/GAbstractView.cpp
@@ -31,16 +31,16 @@ void GAbstractView::set_model(RefPtr<GModel>&& model)
 
 void GAbstractView::did_update_model()
 {
-    if (!model() || model()->selected_index() != m_edit_index)
+    if (!model() || selection().first() != m_edit_index)
         stop_editing();
 }
 
 void GAbstractView::did_update_selection()
 {
-    if (!model() || model()->selected_index() != m_edit_index)
+    if (!model() || selection().first() != m_edit_index)
         stop_editing();
-    if (model() && on_selection && model()->selected_index().is_valid())
-        on_selection(model()->selected_index());
+    if (model() && on_selection && selection().first().is_valid())
+        on_selection(selection().first());
 }
 
 void GAbstractView::did_scroll()
diff --git a/Libraries/LibGUI/GComboBox.cpp b/Libraries/LibGUI/GComboBox.cpp
index 30ad16b9fc..194b70a815 100644
--- a/Libraries/LibGUI/GComboBox.cpp
+++ b/Libraries/LibGUI/GComboBox.cpp
@@ -12,7 +12,7 @@ GComboBox::GComboBox(GWidget* parent)
     m_editor = new GTextEditor(GTextEditor::Type::SingleLine, this);
     m_editor->on_change = [this] {
         if (on_change)
-            on_change(m_editor->text(), model()->selected_index());
+            on_change(m_editor->text(), m_list_view->selection().first());
     };
     m_editor->on_return_pressed = [this] {
         if (on_return_pressed)
diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/GFileSystemModel.cpp
index 14bab66b01..2a9c4cf25d 100644
--- a/Libraries/LibGUI/GFileSystemModel.cpp
+++ b/Libraries/LibGUI/GFileSystemModel.cpp
@@ -194,11 +194,8 @@ GVariant GFileSystemModel::data(const GModelIndex& index, Role role) const
     if (role == GModel::Role::Display)
         return node.name;
     if (role == GModel::Role::Icon) {
-        if (node.type == Node::Directory) {
-            if (selected_index() == index)
-                return m_open_folder_icon;
+        if (node.type == Node::Directory)
             return m_closed_folder_icon;
-        }
         return m_file_icon;
     }
     return {};