diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java
index 3e5c4f99891f..c72cbae2dde9 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/AbstractGradleLinkedProjectAction.java
@@ -57,7 +57,7 @@ public abstract class AbstractGradleLinkedProjectAction extends AnAction {
     }
     
     final String path = GradleSettings.getInstance(project).getLinkedProjectPath();
-    return new Pair<Project, String>(project, path);
+    return path == null ? null : new Pair<Project, String>(project, path);
   }
 
   protected abstract void doUpdate(@NotNull AnActionEvent event, @NotNull Project project, @NotNull String linkedProjectPath);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java
index bb3ba8c226a1..c663c1815404 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.ui.TextComponentAccessor;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
@@ -260,7 +261,10 @@ public class GradleConfigurable implements SearchableConfigurable, Configurable.
     myLinkedGradleProjectPathField.addBrowseFolderListener(
       "",
       GradleBundle.message("gradle.settings.label.select.project"),
-      myProject, GradleUtil.getGradleProjectFileChooserDescriptor()
+      myProject,
+      GradleUtil.getGradleProjectFileChooserDescriptor(),
+      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT,
+      false
     );
     myLinkedGradleProjectPathField.getTextField().getDocument().addDocumentListener(new DocumentListener() {
       @Override
@@ -331,7 +335,9 @@ public class GradleConfigurable implements SearchableConfigurable, Configurable.
       "",
       GradleBundle.message("gradle.settings.text.home.path"),
       null,
-      GradleUtil.getGradleHomeFileChooserDescriptor()
+      GradleUtil.getGradleHomeFileChooserDescriptor(),
+      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT,
+      false
     );
     myGradleHomePathField.getTextField().getDocument().addDocumentListener(new DocumentListener() {
       @Override
@@ -358,7 +364,9 @@ public class GradleConfigurable implements SearchableConfigurable, Configurable.
       "",
       GradleBundle.message("gradle.settings.title.service.dir.path"),
       myProject,
-      new FileChooserDescriptor(false, true, false, false, false, false)
+      new FileChooserDescriptor(false, true, false, false, false, false),
+      TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT,
+      false
     );
     myServiceDirectoryPathField.getTextField().getDocument().addDocumentListener(new DocumentListener() {
       @Override
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
index dd06d8cf8637..b1b224b94330 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
@@ -153,6 +153,11 @@ public class GradleProjectImportBuilder extends ProjectImportBuilder<GradleProje
               }); 
             }
           });
+
+          final String linkedProjectPath = myConfigurable.getLinkedProjectPath();
+          assert linkedProjectPath != null;
+          myConfigurable = null;
+          myGradleProject = null;
           
           final Runnable resolveDependenciesTask = new Runnable() {
             @Override
@@ -161,8 +166,6 @@ public class GradleProjectImportBuilder extends ProjectImportBuilder<GradleProje
                 new Task.Backgroundable(project, GradleBundle.message("gradle.library.resolve.progress.text"), false) {
                   @Override
                   public void run(@NotNull final ProgressIndicator indicator) {
-                    String linkedProjectPath = myConfigurable.getLinkedProjectPath();
-                    assert linkedProjectPath != null;
                     GradleResolveProjectTask task = new GradleResolveProjectTask(project, linkedProjectPath, true);
                     task.execute(indicator);
                     GradleProject projectWithResolvedLibraries = task.getGradleProject();