diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCEditAnswerPlaceholder.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCEditAnswerPlaceholder.java
index a1abac899975..85a2c91fa774 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCEditAnswerPlaceholder.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCEditAnswerPlaceholder.java
@@ -28,7 +28,10 @@ public class CCEditAnswerPlaceholder extends CCAnswerPlaceholderAction {
     }
     CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder.getTaskText(), answerPlaceholder.getHints());
     dlg.setTitle("Edit Answer Placeholder");
-    dlg.show();
+    if (dlg.showAndGet()) {
+      answerPlaceholder.setTaskText(dlg.getTaskText());
+      answerPlaceholder.setHints(dlg.getHints());
+    }
   }
 
   @Override