diff --git a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
index d87f9a54f778..31e168688842 100644
--- a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
@@ -78,7 +78,7 @@ public class JavaScratchConfigurable extends SettingsEditor<JavaScratchConfigura
           toSelect = LocalFileSystem.getInstance().findFileByPath(scratchesRoot);
         }
         final VirtualFile file =
-          FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor(), myScratchPathField, project, toSelect);
+          FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor(), myScratchPathField.getComponent(), project, toSelect);
         if (file != null) {
           setVFileToEditor(file);
         }
@@ -138,12 +138,7 @@ public class JavaScratchConfigurable extends SettingsEditor<JavaScratchConfigura
   }
 
   private void setVFileToEditor(VirtualFile file) {
-    if (file != null) {
-      myScratchPathField.getComponent().setText(FileUtil.toSystemDependentName(file.getPath()));
-    }
-    else {
-      myScratchPathField.setText("");
-    }
+    myScratchPathField.getComponent().setText(file != null? FileUtil.toSystemDependentName(file.getPath()): "");
   }
 
   @NotNull