diff --git a/platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java b/platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java
index cadef4bf8fc1..5cb33f85b025 100644
--- a/platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java
+++ b/platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.PerformInBackgroundOption;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -91,6 +92,8 @@ public class SaveProjectAsTemplateAction extends AnAction {
       final File file = dialog.getTemplateFile();
       final String description = dialog.getDescription();
 
+      FileDocumentManager.getInstance().saveAllDocuments();
+
       ProgressManager.getInstance().run(new Task.Backgroundable(project, "Saving Project as Template", true, PerformInBackgroundOption.DEAF) {
         @Override
         public void run(@NotNull final ProgressIndicator indicator) {