diff --git a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
index c1e139bad7f..599766cc499 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
@@ -18,8 +18,7 @@ package org.jetbrains.jet.plugin.internal.codewindow;
 
 import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.Result;
-import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
@@ -265,12 +264,12 @@ public class BytecodeToolWindow extends JPanel implements Disposable {
     }
 
     private void setText(@NotNull final String resultText) {
-        new WriteCommandAction(myProject) {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
             @Override
-            protected void run(Result result) throws Throwable {
+            public void run() {
                 myEditor.getDocument().setText(StringUtil.convertLineSeparators(resultText));
             }
-        }.execute();
+        });
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
index d4b0250a713..03ee49e90bc 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
@@ -17,13 +17,13 @@
 package org.jetbrains.jet.plugin.internal.resolvewindow;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.Result;
-import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -353,12 +353,12 @@ public class ResolveToolWindow extends JPanel implements Disposable {
     }
 
     private void setText(@NotNull final String text) {
-        new WriteCommandAction(myProject) {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
             @Override
-            protected void run(Result result) throws Throwable {
-                myEditor.getDocument().setText(text);
+            public void run() {
+                myEditor.getDocument().setText(StringUtil.convertLineSeparators(text));
             }
-        }.execute();
+        });
     }
 
     @Override