diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/SurroundWithTemplateHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/SurroundWithTemplateHandler.java
index 2591fd72516d..317d541fd676 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/SurroundWithTemplateHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/SurroundWithTemplateHandler.java
@@ -22,6 +22,11 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public class SurroundWithTemplateHandler implements CodeInsightActionHandler {
+  @Override
+  public boolean startInWriteAction() {
+    return false;
+  }
+
   @Override
   public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
     if (!EditorModificationUtil.checkModificationAllowed(editor)) return;