diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 6e18bde30383..5ba89715c333 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -2723,6 +2723,16 @@ void EditorInspector::update_tree() {
 			section_depth = 0;
 
 			if (!show_categories) {
+				// Find the class name to retrieve information about the following properties. (The category name does not always work.)
+				if (doc_name == "" && !EditorNode::get_editor_data().is_type_recognized(p.name) && p.hint_string.length() && FileAccess::exists(p.hint_string)) {
+					Ref<Script> scr = ResourceLoader::load(p.hint_string, "Script");
+					if (scr.is_valid()) {
+						Vector<DocData::ClassDoc> docs = scr->get_documentation();
+						if (!docs.is_empty()) {
+							doc_name = docs[0].name;
+						}
+					}
+				}
 				continue;
 			}
 
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 6842a1ff4925..5f2ec9ab18f8 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -3853,6 +3853,7 @@ bool GDScriptParser::export_group_annotations(const AnnotationNode *p_annotation
 	switch (t_usage) {
 		case PROPERTY_USAGE_CATEGORY: {
 			annotation->export_info.usage = t_usage;
+			annotation->export_info.hint_string = script_path;
 		} break;
 
 		case PROPERTY_USAGE_GROUP: {