diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
index 3dcfaf2d750c..66358ad755cb 100644
--- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,14 +53,13 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-/*
+/**
  * @author: MYakovlev
- * Date: Aug 15, 2002
- * Time: 1:27:59 PM
+ * @since Aug 15, 2002
  */
-
 public class SdkEditor implements Configurable, Place.Navigator {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.SdkEditor");
+
   private Sdk mySdk;
   private final Map<OrderRootType, SdkPathEditor> myPathEditors = new HashMap<OrderRootType, SdkPathEditor>();
 
@@ -133,6 +132,7 @@ public class SdkEditor implements Configurable, Place.Navigator {
       if (mySdk == null || showTabForType(type)) {
         final SdkPathEditor pathEditor = OrderRootTypeUIFactory.FACTORY.getByKey(type).createPathEditor(mySdk);
         if (pathEditor != null) {
+          pathEditor.setAddBaseDir(mySdk.getHomeDirectory());
           myTabbedPane.addTab(pathEditor.getDisplayName(), pathEditor.createComponent());
           myPathEditors.put(type, pathEditor);
         }
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
index 7db6ea3ef324..6627c435541d 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
@@ -39,6 +39,7 @@ import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.UIUtil;
 import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -52,7 +53,10 @@ import java.util.Set;
  */
 public class PathEditor {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.PathEditor");
+
   public static final Color INVALID_COLOR = new Color(210, 0, 0);
+  private static final Icon ICON_INVALID = IconLoader.getIcon("/nodes/ppInvalid.png");
+  private static final Icon ICON_EMPTY = IconLoader.getIcon("/nodes/emptyNode.png");
 
   protected JPanel myPanel;
   private JBList myList;
@@ -60,8 +64,6 @@ public class PathEditor {
   private final Set<VirtualFile> myAllFiles = new HashSet<VirtualFile>();
   private boolean myModified = false;
   protected boolean myEnabled = false;
-  private static final Icon ICON_INVALID = IconLoader.getIcon("/nodes/ppInvalid.png");
-  private static final Icon ICON_EMPTY = IconLoader.getIcon("/nodes/emptyNode.png");
   private final FileChooserDescriptor myDescriptor;
   private VirtualFile myAddBaseDir;
 
@@ -71,7 +73,7 @@ public class PathEditor {
     myModel = createListModel();
   }
 
-  public void setAddBaseDir(VirtualFile addBaseDir) {
+  public void setAddBaseDir(@Nullable VirtualFile addBaseDir) {
     myAddBaseDir = addBaseDir;
   }