diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ScratchToolWindowFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
similarity index 97%
rename from idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ScratchToolWindowFactory.kt
rename to idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
index 4d9c0c9e125..b1036fff40d 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ScratchToolWindowFactory.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/ToolWindowScratchOutputHandler.kt
@@ -30,28 +30,6 @@ import com.intellij.openapi.wm.ToolWindowManager
 import org.jetbrains.kotlin.idea.scratch.ScratchExpression
 import org.jetbrains.kotlin.idea.scratch.ScratchFile
 
-class ScratchToolWindowFactory : ToolWindowFactory {
-    companion object {
-        val ID = "Scratch Output"
-    }
-
-    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        val consoleView = ConsoleViewImpl(project, true)
-        toolWindow.isToHideOnEmptyContent = true
-        toolWindow.icon = ScratchFileType.INSTANCE.icon
-
-        val contentManager = toolWindow.contentManager
-        val content = contentManager.factory.createContent(consoleView.component, null, false)
-        contentManager.addContent(content)
-        val editor = consoleView.editor
-        if (editor is EditorEx) {
-            editor.isRendererMode = true
-        }
-
-        Disposer.register(project, consoleView)
-    }
-}
-
 object ToolWindowScratchOutputHandler : ScratchOutputHandlerAdapter() {
 
     override fun handle(file: ScratchFile, expression: ScratchExpression, output: ScratchOutput) {
@@ -119,4 +97,26 @@ object ToolWindowScratchOutputHandler : ScratchOutputHandlerAdapter() {
         ScratchToolWindowFactory().createToolWindowContent(project, window)
         return window
     }
-}
\ No newline at end of file
+}
+
+private class ScratchToolWindowFactory : ToolWindowFactory {
+    companion object {
+        const val ID = "Scratch Output"
+    }
+
+    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        val consoleView = ConsoleViewImpl(project, true)
+        toolWindow.isToHideOnEmptyContent = true
+        toolWindow.icon = ScratchFileType.INSTANCE.icon
+
+        val contentManager = toolWindow.contentManager
+        val content = contentManager.factory.createContent(consoleView.component, null, false)
+        contentManager.addContent(content)
+        val editor = consoleView.editor
+        if (editor is EditorEx) {
+            editor.isRendererMode = true
+        }
+
+        Disposer.register(project, consoleView)
+    }
+}