diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.form b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.form
index 1e0288175eda..253a1e59067d 100644
--- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.form
+++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.form
@@ -55,7 +55,7 @@
                             <constraints border-constraint="West"/>
                             <properties/>
                           </component>
-                          <component id="ee75f" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="mySourceDirField">
+                          <component id="ee75f" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="mySourceDirField" custom-create="true">
                             <constraints border-constraint="Center"/>
                             <properties/>
                           </component>
@@ -72,7 +72,7 @@
                             <constraints border-constraint="West"/>
                             <properties/>
                           </component>
-                          <component id="cc2ae" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myTargetDirField">
+                          <component id="cc2ae" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myTargetDirField" custom-create="true">
                             <constraints border-constraint="Center"/>
                             <properties/>
                           </component>
diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
index f76e2d45e776..2aa56954dd65 100644
--- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
+++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
@@ -511,6 +511,9 @@ public class DirDiffPanel implements Disposable, DataProvider {
   }
 
   private void createUIComponents() {
+    mySourceDirField = new TextFieldWithBrowseButton(null, this);
+    myTargetDirField = new TextFieldWithBrowseButton(null, this);
+
     final AtomicBoolean callUpdate = new AtomicBoolean(true);
     myRootPanel = new JPanel(new BorderLayout()) {
       @Override
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java b/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
index 04c8438f3897..83324bfdd387 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
@@ -41,15 +41,23 @@ public class TextFieldWithBrowseButton extends ComponentWithBrowseButton<JTextFi
   }
 
   public TextFieldWithBrowseButton(JTextField field, @Nullable ActionListener browseActionListener) {
+    this(field, browseActionListener, null);
+  }
+
+  public TextFieldWithBrowseButton(JTextField field, @Nullable ActionListener browseActionListener, @Nullable Disposable parent) {
     super(field, browseActionListener);
     if (!(field instanceof JBTextField)) {
       UIUtil.addUndoRedoActions(field);
     }
-    installPathCompletion(FileChooserDescriptorFactory.createSingleLocalFileDescriptor());
+    installPathCompletion(FileChooserDescriptorFactory.createSingleLocalFileDescriptor(), parent);
   }
 
   public TextFieldWithBrowseButton(ActionListener browseActionListener) {
-    this(new JBTextField(10/* to prevent field to be infinitely resized in grid-box layouts */), browseActionListener);
+    this(browseActionListener, null);
+  }
+
+  public TextFieldWithBrowseButton(ActionListener browseActionListener, Disposable parent) {
+    this(new JBTextField(10/* to prevent field to be infinitely resized in grid-box layouts */), browseActionListener, parent);
   }
 
   public void addBrowseFolderListener(@Nullable String title, @Nullable String description, @Nullable Project project, FileChooserDescriptor fileChooserDescriptor) {