diff --git a/Kernel/FileSystem/ProcFS.cpp b/Kernel/FileSystem/ProcFS.cpp
index 20349cfaed9..df9a22207a6 100644
--- a/Kernel/FileSystem/ProcFS.cpp
+++ b/Kernel/FileSystem/ProcFS.cpp
@@ -363,8 +363,9 @@ Optional<KBuffer> procfs$interrupts(InodeIdentifier)
     JsonArraySerializer array { builder };
     InterruptManagement::the().enumerate_interrupt_handlers([&array](GenericInterruptHandler& handler) {
         auto obj = array.add_object();
-        obj.add("purpose", "Interrupt Handler"); // FIXME: Determine the right description for each interrupt handler.
+        obj.add("purpose", handler.purpose());
         obj.add("interrupt_line", handler.interrupt_number());
+        obj.add("controller", handler.controller());
         obj.add("cpu_handler", 0); // FIXME: Determine the responsible CPU for each interrupt handler.
         obj.add("device_sharing", (unsigned)handler.sharing_devices_count());
         obj.add("call_count", (unsigned)handler.get_invoking_count());
diff --git a/Kernel/Interrupts/InterruptManagement.cpp b/Kernel/Interrupts/InterruptManagement.cpp
index adf9b0400b8..65571a4f834 100644
--- a/Kernel/Interrupts/InterruptManagement.cpp
+++ b/Kernel/Interrupts/InterruptManagement.cpp
@@ -63,7 +63,7 @@ void InterruptManagement::enumerate_interrupt_handlers(Function<void(GenericInte
 {
     for (int i = 0; i < GENERIC_INTERRUPT_HANDLERS_COUNT; i++) {
         auto& handler = get_interrupt_handler(i);
-        if (handler.get_invoking_count() > 0)
+        if (handler.type() != HandlerType::UnhandledInterruptHandler)
             callback(handler);
     }
 }