diff --git a/Kernel/Process.h b/Kernel/Process.h
index d027cfe3a47f22f98b11767427a58e21e6d33f11..d5e3c8e239a6f8e3cd9f96f12f799849d39c17b9 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -426,22 +426,12 @@ inline void Process::for_each_thread(Callback callback) const
 {
     InterruptDisabler disabler;
     pid_t my_pid = pid();
-    for (auto* thread = g_runnable_threads->head(); thread;) {
-        auto* next_thread = thread->next();
-        if (thread->pid() == my_pid) {
-            if (callback(*thread) == IterationDecision::Break)
-                break;
-        }
-        thread = next_thread;
-    }
-    for (auto* thread = g_nonrunnable_threads->head(); thread;) {
-        auto* next_thread = thread->next();
-        if (thread->pid() == my_pid) {
-            if (callback(*thread) == IterationDecision::Break)
-                break;
-        }
-        thread = next_thread;
-    }
+    Thread::for_each([callback, my_pid](Thread& thread) -> IterationDecision {
+        if (thread.pid() == my_pid)
+            return callback(thread);
+
+        return IterationDecision::Continue;
+    });
 }
 
 template<typename Callback>