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 69cd978e41e1..7a9ecd7906a0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
@@ -40,6 +40,7 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.ui.*;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.ui.*;
+import com.intellij.ui.table.JBTable;
 import com.intellij.ui.table.TableView;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.Alarm;
@@ -166,7 +167,7 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
   }
 
   public JComponent getPreferredFocusedComponent() {
-    final JTable table = myParametersList == null ? myParametersTable : myParametersList.getTable();
+    final JTable table = getTableComponent();
 
     if (table.getRowCount() > 0) {
       if (table.getColumnModel().getSelectedColumnCount() == 0) {
@@ -180,6 +181,10 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
     }
   }
 
+  protected JBTable getTableComponent() {
+    return myParametersList == null ? myParametersTable : myParametersList.getTable();
+  }
+
 
   protected JComponent createNorthPanel() {
     JPanel panel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, -4, 0, true, false));
@@ -418,7 +423,7 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
     }
     else {
       final JPanel buttonsPanel =
-        ToolbarDecorator.createDecorator(myParametersList == null ? myParametersTable : myParametersList.getTable())
+        ToolbarDecorator.createDecorator(getTableComponent())
           .addExtraAction(myPropagateParamChangesButton)
           .createPanel();