diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
index 55f10b5a567f..dfce5ea27061 100644
--- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
+++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureDialog.java
@@ -160,11 +160,11 @@ public class PyChangeSignatureDialog extends ChangeSignatureDialogBase<PyParamet
           return PyBundle.message("ANN.regular.param.after.keyword");
         }
         final String defaultValue = parameter.getDefaultValue();
-        if (defaultValue != null && !StringUtil.isEmptyOrSpaces(defaultValue)) {
+        if (defaultValue != null && !StringUtil.isEmptyOrSpaces(defaultValue) && parameter.getDefaultInSignature()) {
           hadDefaultValue = true;
         }
         else {
-          if (hadDefaultValue && parameter.getDefaultInSignature() && !hadSingleStar && (!languageLevel.isPy3K() || !hadPositionalContainer)) {
+          if (hadDefaultValue && !hadSingleStar && (!languageLevel.isPy3K() || !hadPositionalContainer)) {
             return PyBundle.message("ANN.non.default.param.after.default");
           }
         }
diff --git a/python/testData/refactoring/changeSignature/nonDefaultAfterDefault1.py b/python/testData/refactoring/changeSignature/nonDefaultAfterDefault1.py
new file mode 100644
index 000000000000..88bd9440904e
--- /dev/null
+++ b/python/testData/refactoring/changeSignature/nonDefaultAfterDefault1.py
@@ -0,0 +1,2 @@
+def foo(b=1):
+  pass
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
index 4344f4ade73f..649dfe9c87b1 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
@@ -96,6 +96,11 @@ public class PyChangeSignatureTest extends PyTestCase {
     doValidationTest(null, Arrays.asList(new PyParameterInfo(-1, "a", "2", false), new PyParameterInfo(1, "b", "2", false)), null);
   }
 
+  public void testNonDefaultAfterDefault1() {
+    doValidationTest(null, Arrays.asList(new PyParameterInfo(1, "b", "1", true), new PyParameterInfo(-1, "a", "2", false)),
+                     PyBundle.message("ANN.non.default.param.after.default"));
+  }
+
   public void doChangeSignatureTest(@Nullable String newName, @Nullable List<PyParameterInfo> parameters) {
     myFixture.configureByFile("refactoring/changeSignature/" + getTestName(true) + ".before.py");
     changeSignature(newName, parameters);