diff --git a/module.config/src/main/java/dev/anvilcraft/lib/v2/config/ConfigData.java b/module.config/src/main/java/dev/anvilcraft/lib/v2/config/ConfigData.java
index f89dc0ad..72b321e6 100644
--- a/module.config/src/main/java/dev/anvilcraft/lib/v2/config/ConfigData.java
+++ b/module.config/src/main/java/dev/anvilcraft/lib/v2/config/ConfigData.java
@@ -71,16 +71,19 @@ private static void providerAdd(ProviderProxy proxy, String modId, ModConfig.Typ
                 name = FormattingUtil.toEnglishName(fieldName);
             }
             if (parent != null) fieldName = parent + "." + fieldName;
+            Comment comment = field.getAnnotation(Comment.class);
             boolean flag = field.isAnnotationPresent(CollapsibleObject.class);
             Class<?> fieldType = field.getType();
             if (flag) {
                 proxy.add(COLLAPSIBLE_OBJECT_BUTTON_STRING.formatted(modId, fieldName), name);
-                proxy.add(COLLAPSIBLE_OBJECT_TOOLTIP_STRING.formatted(modId, fieldName), name);
+                proxy.add(
+                    COLLAPSIBLE_OBJECT_TOOLTIP_STRING.formatted(modId, fieldName),
+                    comment == null ? name : comment.value()
+                );
                 ConfigData.readConfigClass(proxy, modId, type, fieldType, fieldName);
             }
             proxy.add(OPTION_STRING.formatted(modId, fieldName), name);
-            if (field.isAnnotationPresent(Comment.class)) {
-                Comment comment = field.getAnnotation(Comment.class);
+            if (comment != null) {
                 proxy.add(TOOLTIP_STRING.formatted(modId, fieldName), comment.value());
             }
             if (Enum.class.isAssignableFrom(fieldType) && TranslatableEnum.class.isAssignableFrom(fieldType)) {