diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ActionRunningMode.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ActionRunningMode.kt
index d759bc3e1ca..d38b3ea9328 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ActionRunningMode.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ActionRunningMode.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.util
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.command.CommandProcessor
 
 enum class ActionRunningMode {
     RUN_IN_CURRENT_THREAD,
@@ -19,7 +20,9 @@ inline fun <T> ActionRunningMode.runAction(crossinline action: () -> T): T = whe
     ActionRunningMode.RUN_IN_EDT -> {
         var result: T? = null
         ApplicationManager.getApplication().invokeAndWait {
-            result = ApplicationManager.getApplication().runWriteAction<T> { action() }
+            CommandProcessor.getInstance().runUndoTransparentAction {
+                result = ApplicationManager.getApplication().runWriteAction<T> { action() }
+            }
         }
         result!!
     }
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ShortenReferenceProcessing.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ShortenReferenceProcessing.kt
index 02a218214dd..1072cf1e90e 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ShortenReferenceProcessing.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ShortenReferenceProcessing.kt
@@ -28,20 +28,18 @@ class ShortenReferenceProcessing : FileBasedPostProcessing() {
     }
 
     override fun runProcessing(file: KtFile, allFiles: List<KtFile>, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) {
-        CommandProcessor.getInstance().runUndoTransparentAction {
-            if (rangeMarker != null) {
-                if (rangeMarker.isValid) {
-                    ShortenReferences.DEFAULT.process(
-                        file,
-                        rangeMarker.startOffset,
-                        rangeMarker.endOffset,
-                        filter,
-                        actionRunningMode = ActionRunningMode.RUN_IN_EDT
-                    )
-                }
-            } else {
-                ShortenReferences.DEFAULT.process(file, filter, actionRunningMode = ActionRunningMode.RUN_IN_EDT)
+        if (rangeMarker != null) {
+            if (rangeMarker.isValid) {
+                ShortenReferences.DEFAULT.process(
+                    file,
+                    rangeMarker.startOffset,
+                    rangeMarker.endOffset,
+                    filter,
+                    actionRunningMode = ActionRunningMode.RUN_IN_EDT
+                )
             }
+        } else {
+            ShortenReferences.DEFAULT.process(file, filter, actionRunningMode = ActionRunningMode.RUN_IN_EDT)
         }
     }
 }