diff --git a/Userland/Libraries/LibJS/Runtime/Set.h b/Userland/Libraries/LibJS/Runtime/Set.h
index 4f3fc0cf683..ea06df52edf 100644
--- a/Userland/Libraries/LibJS/Runtime/Set.h
+++ b/Userland/Libraries/LibJS/Runtime/Set.h
@@ -22,13 +22,13 @@ public:
     explicit Set(Object& prototype);
     virtual ~Set() override;
 
-    HashTable<Value, ValueTraits> const& values() const { return m_values; };
-    HashTable<Value, ValueTraits>& values() { return m_values; };
+    OrderedHashTable<Value, ValueTraits> const& values() const { return m_values; };
+    OrderedHashTable<Value, ValueTraits>& values() { return m_values; };
 
 private:
     virtual void visit_edges(Visitor& visitor) override;
 
-    HashTable<Value, ValueTraits> m_values; // FIXME: Replace with a HashTable that maintains a linked list of insertion order for correct iteration order
+    OrderedHashTable<Value, ValueTraits> m_values;
 };
 
 }
diff --git a/Userland/Libraries/LibJS/Runtime/SetIterator.h b/Userland/Libraries/LibJS/Runtime/SetIterator.h
index 873d81676fa..114316339de 100644
--- a/Userland/Libraries/LibJS/Runtime/SetIterator.h
+++ b/Userland/Libraries/LibJS/Runtime/SetIterator.h
@@ -33,7 +33,7 @@ private:
     Set& m_set;
     bool m_done { false };
     Object::PropertyKind m_iteration_kind;
-    HashTable<Value, ValueTraits>::Iterator m_iterator;
+    OrderedHashTable<Value, ValueTraits>::Iterator m_iterator;
 };
 
 }