diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
index 169eb1702a2..26ab762b68a 100644
--- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
+++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
@@ -87,6 +87,7 @@ public interface DescriptorRenderer extends Renderer<DeclarationDescriptor> {
     DescriptorRenderer HTML_NAMES_WITH_SHORT_TYPES = new DescriptorRendererBuilder()
             .setWithDefinedIn(false)
             .setShortNames(true)
+            .setRenderClassObjectName(true)
             .setTextFormat(TextFormat.HTML).build();
 
     DescriptorRenderer HTML = new DescriptorRendererBuilder().setTextFormat(TextFormat.HTML).build();
diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
index 30e3d1d6d16..5d52d875f14 100644
--- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
@@ -211,8 +211,15 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
 
     private void renderClassObjectName(@NotNull DeclarationDescriptor descriptor, @NotNull StringBuilder builder) {
         if (renderClassObjectName) {
-            if (!startFromName) renderSpaceIfNeeded(builder);
-            builder.append("<class object>");
+            if (startFromName) {
+                builder.append("class object");
+            }
+            renderSpaceIfNeeded(builder);
+            DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
+            if (containingDeclaration != null) {
+                builder.append("of ");
+                builder.append(renderName(containingDeclaration.getName()));
+            }
         }
         if (verbose) {
             if (!startFromName) renderSpaceIfNeeded(builder);
diff --git a/idea/testData/structureView/fileStructure/Render.after b/idea/testData/structureView/fileStructure/Render.after
index 71e3e7d0bc2..d8c493f1def 100644
--- a/idea/testData/structureView/fileStructure/Render.after
+++ b/idea/testData/structureView/fileStructure/Render.after
@@ -12,7 +12,7 @@
   Inner1
   Inner2
  -A6
-  -<class object>
+  -class object of A6
    test(): Unit
  -A7
   <class initializer>