diff --git a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
index d62929324ad1..ec0554f8412f 100644
--- a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+++ b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
@@ -30,25 +30,36 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
     final RunResult<T> result = new RunResult<T>(this);
 
     final Application application = ApplicationManager.getApplication();
-    if (application.isWriteAccessAllowed()) {
-      result.run();
+    boolean dispatchThread = application.isDispatchThread();
+    if (dispatchThread) {
+      AccessToken token = start(getClass());
+      try {
+        result.run();
+      } finally {
+        token.finish();
+      }
       return result;
     }
 
-    boolean dispatchThread = application.isDispatchThread();
-    if (!dispatchThread && application.isReadAccessAllowed()) {
+    if (application.isReadAccessAllowed()) {
       LOG.error("Must not start write action from within read action in the other thread - deadlock is coming");
     }
 
     application.invokeAndWait(new Runnable() {
       @Override
       public void run() {
-        AccessToken token = application.acquireWriteActionLock(WriteAction.this.getClass());
+        AccessToken transaction = TransactionGuard.getInstance().startSynchronousTransaction(TransactionKind.ANY_CHANGE);
         try {
-          result.run();
+          AccessToken token = start(WriteAction.this.getClass());
+          try {
+            result.run();
+          }
+          finally {
+            token.finish();
+          }
         }
         finally {
-          token.finish();
+          transaction.finish();
         }
       }
     }, ModalityState.defaultModalityState());
diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
index 0760d0307784..aaeef86ea374 100644
--- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
@@ -72,21 +72,32 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
   @Override
   public RunResult<T> execute() {
     Application application = ApplicationManager.getApplication();
-    if (!application.isDispatchThread() && application.isReadAccessAllowed()) {
+    final boolean dispatchThread = application.isDispatchThread();
+    if (!dispatchThread && application.isReadAccessAllowed()) {
       LOG.error("Must not start write action from within read action in the other thread - deadlock is coming");
       throw new IllegalStateException();
     }
     final RunResult<T> result = new RunResult<T>(this);
 
-    try {
-      application.invokeAndWait(new Runnable() {
-        @Override
-        public void run() {
-          performWriteCommandAction(result);
-        }
-      }, ModalityState.defaultModalityState());
+    if (dispatchThread) {
+      performWriteCommandAction(result);
+    } else {
+      try {
+        application.invokeAndWait(new Runnable() {
+          @Override
+          public void run() {
+            AccessToken token = TransactionGuard.getInstance().startSynchronousTransaction(TransactionKind.ANY_CHANGE);
+            try {
+              performWriteCommandAction(result);
+            }
+            finally {
+              token.finish();
+            }
+          }
+        }, ModalityState.defaultModalityState());
+      }
+      catch (ProcessCanceledException ignored) { }
     }
-    catch (ProcessCanceledException ignored) { }
     return result;
   }