diff --git a/python/pluginSrc/com/jetbrains/python/facet/PythonSdkEditorTab.form b/python/pluginSrc/com/jetbrains/python/facet/PythonSdkEditorTab.form
index db95d7a4d27b..cb0539eb060f 100644
--- a/python/pluginSrc/com/jetbrains/python/facet/PythonSdkEditorTab.form
+++ b/python/pluginSrc/com/jetbrains/python/facet/PythonSdkEditorTab.form
@@ -6,7 +6,9 @@
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties/>
-    <border type="none"/>
+    <border type="empty">
+      <size top="5" left="10" bottom="10" right="10"/>
+    </border>
     <children>
       <component id="5b600" class="com.jetbrains.python.facet.PythonSdkComboBox" binding="mySdkComboBox">
         <constraints>
diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java b/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java
index 1b6c9730cca1..77b095b6145a 100644
--- a/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java
+++ b/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java
@@ -24,12 +24,14 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.util.ui.JBUI;
 import org.jdom.Element;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -106,7 +108,10 @@ public class BuildoutFacetConfiguration implements FacetConfiguration {
     @NotNull
     @Override
     public JComponent createComponent() {
-      return myPanel;
+      final JPanel panel = new JPanel(new BorderLayout());
+      panel.add(myPanel, BorderLayout.CENTER);
+      panel.setBorder(JBUI.Borders.empty(5, 10, 10, 10));
+      return panel;
     }
 
     @Override