diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
index 84e7d9af638f..cc289e6c14ea 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
@@ -200,7 +200,7 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
       typePanel.add(myReturnTypeField);
 
       if (myMethod.canChangeReturnType() == MethodDescriptor.ReadWriteOption.ReadWrite) {
-        myReturnTypeField.setPreferredSize(new Dimension(200, 24));
+        typePanel.setPreferredSize(new Dimension(200, -1));
         myReturnTypeField.addDocumentListener(documentListener);
       }
       else {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java
index 45e08fe4cc32..e611d5a0e089 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java
@@ -17,7 +17,9 @@ package com.intellij.refactoring.ui;
 
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.ui.VerticalFlowLayout;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.DialogUtil;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.UIUtil;
@@ -25,6 +27,7 @@ import com.intellij.util.ui.UIUtil;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 /**
  * @author Konstantin Bulenkov
@@ -53,7 +56,10 @@ public class ComboBoxVisibilityPanel extends VisibilityPanelBase implements Shor
 
     add(myLabel);
     final JComponent panel = myGroup.createCustomComponent(myGroup.getTemplatePresentation());
-    add(panel);
+    final JPanel p = new JPanel(new BorderLayout());
+    p.add(panel, BorderLayout.SOUTH);
+    p.setBorder(IdeBorderFactory.createEmptyBorder(SystemInfo.isMac ? 3 : 2 ,0,0,0));
+    add(p);
     myButton = UIUtil.findComponentOfType(panel, JButton.class);
     DialogUtil.registerMnemonic(myLabel, this);
   }
@@ -97,6 +103,10 @@ public class ComboBoxVisibilityPanel extends VisibilityPanelBase implements Shor
     }
   }
 
+  public JButton getButton() {
+    return myButton;
+  }
+
   @Override
   public Shortcut getShortcut() {
     final int index = myLabel.getDisplayedMnemonicIndex();