diff --git a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt
index 4df90d3d..febb7de0 100644
--- a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt
+++ b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt
@@ -141,9 +141,9 @@ class MainPluginPanelFactory : ToolWindowFactory {
      * Switches the editor to the virtualFile.
      */
     private fun focusOnFile(virtualFile: VirtualFile) {
-        ApplicationManager.getApplication().invokeAndWait {
+        ApplicationManager.getApplication().invokeLater {
             FileEditorManager.getInstance(project).openFile(
-                virtualFile, false
+                virtualFile, true
             )
         }
     }