diff --git a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
index eac19ec135b3..63f3cda23917 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
@@ -291,19 +291,21 @@ public abstract class PydevConsoleCommunication extends AbstractConsoleCommunica
 
     // add code fragment to myConsoleView.getHistoryPsiFile()
     PsiFile psi = getHistoryPsiFile();
-      if (myConsoleView != null && psi != null) {
-        WriteCommandAction.runWriteCommandAction(myProject, null, null,
-                                                 () -> {
-                                                   PsiElement[] newElems =
-                                                     PyElementGenerator.getInstance(myProject)
-                                                       .createDummyFile(LanguageLevel.forElement(myConsoleView.getFile()), command.getText())
-                                                       .getChildren();
-                                                   for (PsiElement elem : newElems) {
-                                                     psi.add(elem);
-                                                   }
-                                                 },
-                                                 psi);
-      }
+    if (myConsoleView != null && psi != null) {
+      ApplicationManager.getApplication().invokeLater(
+        () -> WriteCommandAction.runWriteCommandAction(myProject, null, null,
+                                                       () -> {
+                                                         PsiElement[] newElems =
+                                                           PyElementGenerator.getInstance(myProject)
+                                                             .createDummyFile(LanguageLevel.forElement(myConsoleView.getFile()),
+                                                                              command.getText())
+                                                             .getChildren();
+                                                         for (PsiElement elem : newElems) {
+                                                           psi.add(elem);
+                                                         }
+                                                       },
+                                                       psi));
+    }
 
     boolean more;
     try {