diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt
new file mode 100644
index 00000000000..00d35d3b807
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.structureView
+
+import com.intellij.ide.structureView.StructureViewBuilderProvider
+import com.intellij.openapi.fileTypes.FileType
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.project.Project
+import com.intellij.ide.structureView.StructureViewBuilder
+import com.intellij.psi.PsiManager
+import org.jetbrains.jet.plugin.decompiler.JetClsFile
+
+//TODO: workaround for bug in JavaClsStructureViewBuilderProvider, remove when IDEA api is updated
+public class JetClsStructureViewBuilderProvider : StructureViewBuilderProvider {
+    override fun getStructureViewBuilder(fileType: FileType, file: VirtualFile, project: Project): StructureViewBuilder? {
+        val psiFile = PsiManager.getInstance(project).findFile(file) as? JetClsFile ?: return null
+        return JetStructureViewFactory().getStructureViewBuilder(psiFile)
+    }
+}
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 91c8ed2a1e9..7273f66e7cc 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -223,6 +223,8 @@
     <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
     <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
     <lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.jet.plugin.structureView.JetStructureViewFactory"/>
+    <structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.jet.plugin.structureView.JetClsStructureViewBuilderProvider"/>
+
     <lang.foldingBuilder language="jet" implementationClass="org.jetbrains.jet.plugin.JetFoldingBuilder"/>
     <lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
     <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>