diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolInfoComponents.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolInfoComponents.cs
index 16d2a96..ef412e5 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolInfoComponents.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolInfoComponents.cs
@@ -410,10 +410,10 @@ public static partial class SymbolInfoComponents
     }
 
     private static readonly Color HrColour = new Color("4d4d4d");
-    private static void AddDocs(this RichTextLabel label, IMethodSymbol methodSymbol)
+    private static void AddDocs(this RichTextLabel label, ISymbol symbol)
     {
-        if (methodSymbol.IsOverride) methodSymbol = methodSymbol.OverriddenMethod!;
-        var xmlDocs = methodSymbol.GetDocumentationCommentXml();
+        if (symbol.IsOverride) symbol = symbol.GetOverriddenMember()!;
+        var xmlDocs = symbol.GetDocumentationCommentXml();
         if (string.IsNullOrWhiteSpace(xmlDocs)) return;
         label.AddHr(100, 1, HrColour);
         label.Newline();
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs
index 95cf941..bbbe2bc 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/FieldTooltip.cs
@@ -25,8 +25,11 @@ public static partial class SymbolInfoComponents
         label.AddFieldName(symbol);
         label.AddText(";");
         label.AddContainingNamespaceAndClass(symbol);
+        label.Newline();
+        //label.AddTypeParameterArguments(symbol);
+        label.Pop(); // font
+        label.AddDocs(symbol);
         
-        label.Pop();
         label.Pop();
         return label;
     }
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs
index 2734034..5700ecb 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SymbolTooltips/PropertyTooltip.cs
@@ -25,8 +25,11 @@ public partial class SymbolInfoComponents
         label.AddPropertyName(symbol);
         label.AddGetSetAccessors(symbol);
         label.AddContainingNamespaceAndClass(symbol);
+        label.Newline();
+        //label.AddTypeParameterArguments(symbol);
+        label.Pop(); // font
+        label.AddDocs(symbol);
         
-        label.Pop();
         label.Pop();
         return label;
     }