diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index ff716bb8bc..9ab1df2a15 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5221,9 +5221,11 @@ Ref<Texture2D> EditorNode::get_object_icon(const Object *p_object, const String
 
 Ref<Texture2D> EditorNode::get_class_icon(const String &p_class, const String &p_fallback) {
 	ERR_FAIL_COND_V_MSG(p_class.is_empty(), nullptr, "Class name cannot be empty.");
+	const Pair<String, String> key(p_class, p_fallback);
+
 	// Take from the local cache, if available.
 	{
-		Ref<Texture2D> *icon = class_icon_cache.getptr(p_class);
+		Ref<Texture2D> *icon = class_icon_cache.getptr(key);
 		if (icon) {
 			return *icon;
 		}
@@ -5237,7 +5239,7 @@ Ref<Texture2D> EditorNode::get_class_icon(const String &p_class, const String &p
 	}
 
 	Ref<Texture2D> icon = _get_class_or_script_icon(p_class, script_path, p_fallback, true);
-	class_icon_cache[p_class] = icon;
+	class_icon_cache[key] = icon;
 	return icon;
 }
 
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 613a574f0b..e8043b89be 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -485,7 +485,7 @@ private:
 	PrintHandlerList print_handler;
 
 	HashMap<String, Ref<Texture2D>> icon_type_cache;
-	HashMap<String, Ref<Texture2D>> class_icon_cache;
+	HashMap<Pair<String, String>, Ref<Texture2D>> class_icon_cache;
 
 	ProjectUpgradeTool *project_upgrade_tool = nullptr;
 	bool run_project_upgrade_tool = false;