diff --git a/Userland/Libraries/LibGUI/TreeView.cpp b/Userland/Libraries/LibGUI/TreeView.cpp
index 3363e28e73..87d58ad7d6 100644
--- a/Userland/Libraries/LibGUI/TreeView.cpp
+++ b/Userland/Libraries/LibGUI/TreeView.cpp
@@ -25,12 +25,12 @@ struct TreeView::MetadataForIndex {
 TreeView::MetadataForIndex& TreeView::ensure_metadata_for_index(ModelIndex const& index) const
 {
     VERIFY(index.is_valid());
-    auto it = m_view_metadata.find(index.internal_data());
+    auto it = m_view_metadata.find(index);
     if (it != m_view_metadata.end())
         return *it->value;
     auto new_metadata = make<MetadataForIndex>();
     auto& new_metadata_ref = *new_metadata;
-    m_view_metadata.set(index.internal_data(), move(new_metadata));
+    m_view_metadata.set(index, move(new_metadata));
     return new_metadata_ref;
 }
 
diff --git a/Userland/Libraries/LibGUI/TreeView.h b/Userland/Libraries/LibGUI/TreeView.h
index 75ba2abe5d..3e1543e8a8 100644
--- a/Userland/Libraries/LibGUI/TreeView.h
+++ b/Userland/Libraries/LibGUI/TreeView.h
@@ -72,7 +72,7 @@ private:
     MetadataForIndex& ensure_metadata_for_index(ModelIndex const&) const;
     void set_open_state_of_all_in_subtree(ModelIndex const& root, bool open);
 
-    mutable HashMap<void*, NonnullOwnPtr<MetadataForIndex>> m_view_metadata;
+    mutable HashMap<ModelIndex, NonnullOwnPtr<MetadataForIndex>> m_view_metadata;
 
     RefPtr<Gfx::Bitmap> m_expand_bitmap;
     RefPtr<Gfx::Bitmap> m_collapse_bitmap;