diff --git a/Libraries/LibDevTools/Actors/InspectorActor.cpp b/Libraries/LibDevTools/Actors/InspectorActor.cpp
index ac85d25cffe..96f8ca150f5 100644
--- a/Libraries/LibDevTools/Actors/InspectorActor.cpp
+++ b/Libraries/LibDevTools/Actors/InspectorActor.cpp
@@ -29,7 +29,7 @@ InspectorActor::InspectorActor(DevToolsServer& devtools, String name, WeakPtr<Ta
 
 InspectorActor::~InspectorActor() = default;
 
-void InspectorActor::handle_message(StringView type, JsonObject const&)
+void InspectorActor::handle_message(StringView type, JsonObject const& message)
 {
     JsonObject response;
     response.set("from"sv, name());
@@ -44,10 +44,17 @@ void InspectorActor::handle_message(StringView type, JsonObject const&)
     }
 
     if (type == "getHighlighterByType"sv) {
-        if (!m_highlighter)
-            m_highlighter = devtools().register_actor<HighlighterActor>();
+        auto type_name = message.get_string("typeName"sv);
+        if (!type_name.has_value()) {
+            send_missing_parameter_error("typeName"sv);
+            return;
+        }
 
-        response.set("highlighter"sv, m_highlighter->serialize_highlighter());
+        auto highlighter = m_highlighters.ensure(*type_name, [&]() -> NonnullRefPtr<HighlighterActor> {
+            return devtools().register_actor<HighlighterActor>();
+        });
+
+        response.set("highlighter"sv, highlighter->serialize_highlighter());
         send_message(move(response));
         return;
     }
diff --git a/Libraries/LibDevTools/Actors/InspectorActor.h b/Libraries/LibDevTools/Actors/InspectorActor.h
index ee6c513b13d..dc06901908d 100644
--- a/Libraries/LibDevTools/Actors/InspectorActor.h
+++ b/Libraries/LibDevTools/Actors/InspectorActor.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <AK/HashMap.h>
 #include <AK/NonnullRefPtr.h>
 #include <LibDevTools/Actor.h>
 
@@ -27,7 +28,7 @@ private:
 
     WeakPtr<TabActor> m_tab;
     WeakPtr<PageStyleActor> m_page_style;
-    WeakPtr<HighlighterActor> m_highlighter;
+    HashMap<String, WeakPtr<HighlighterActor>> m_highlighters;
 };
 
 }