diff --git a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp
index 2d74a8b1b0..423a0ab75e 100644
--- a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp
+++ b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp
@@ -9,6 +9,7 @@
 #include <AK/CharacterTypes.h>
 #include <AK/Hex.h>
 #include <AK/Platform.h>
+#include <AK/Utf16View.h>
 #include <AK/Utf8View.h>
 #include <LibJS/Console.h>
 #include <LibJS/Heap/DeferGC.h>
@@ -548,7 +549,7 @@ JS_DEFINE_NATIVE_FUNCTION(GlobalObject::escape)
 {
     auto string = TRY(vm.argument(0).to_string(global_object));
     StringBuilder escaped;
-    for (auto code_point : Utf8View(string)) {
+    for (auto code_point : utf8_to_utf16(string)) {
         if (code_point < 256) {
             if ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@*_+-./"sv.contains(code_point))
                 escaped.append(code_point);
@@ -556,7 +557,7 @@ JS_DEFINE_NATIVE_FUNCTION(GlobalObject::escape)
                 escaped.appendff("%{:02X}", code_point);
             continue;
         }
-        escaped.appendff("%u{:04X}", code_point); // FIXME: Handle utf-16 surrogate pairs
+        escaped.appendff("%u{:04X}", code_point);
     }
     return js_string(vm, escaped.build());
 }
diff --git a/Userland/Libraries/LibJS/Tests/builtins/functions/escapeUnescape.js b/Userland/Libraries/LibJS/Tests/builtins/functions/escapeUnescape.js
index c8e29a4a89..69862fa426 100644
--- a/Userland/Libraries/LibJS/Tests/builtins/functions/escapeUnescape.js
+++ b/Userland/Libraries/LibJS/Tests/builtins/functions/escapeUnescape.js
@@ -4,6 +4,7 @@ test("escape", () => {
         ["äöü", "%E4%F6%FC"],
         ["ć", "%u0107"],
         ["@*_+-./", "@*_+-./"],
+        ["\ud834\udf06", "%uD834%uDF06"],
     ].forEach(test => {
         expect(escape(test[0])).toBe(test[1]);
     });