diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
index f84533920c2a..0e6b29847186 100644
--- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
+++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
@@ -194,6 +194,12 @@ public class PyChangeSignatureDialog extends ChangeSignatureDialogBase<PyParamet
   @Override
   protected ValidationInfo doValidate() {
     final String message = validateAndCommitData();
+    SwingUtilities.invokeLater(new Runnable() {
+      public void run() {
+        getRefactorAction().setEnabled(message == null);
+        getPreviewAction().setEnabled(message == null);
+      }
+    });
     if (message != null) return new ValidationInfo(message);
     return super.doValidate();
   }