diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
index 9470d6de9f9..908936132d5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
@@ -117,11 +117,11 @@ abstract class KotlinExtractSuperDialogBase(
             add(fileNameField, BorderLayout.CENTER)
         }
 
-        return FormBuilder
-                .createFormBuilder()
-                .addComponent(targetDirectoryPanel)
-                .addComponent(targetFileNamePanel)
-                .panel
+        val formBuilder = FormBuilder.createFormBuilder()
+        if (targetDirectoryPanel != null) {
+            formBuilder.addComponent(targetDirectoryPanel)
+        }
+        return formBuilder.addComponent(targetFileNamePanel).panel
     }
 
     override fun createNorthPanel(): JComponent? {