diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index 77eff9d9519..e63d042569a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -327,7 +327,7 @@ fun <T> chooseContainerElement(
     toPsi: (T) -> PsiElement,
     onSelect: (T) -> Unit
 ) {
-    return getPsiElementPopup(
+    val popup = getPsiElementPopup(
         editor,
         containers,
         object : PsiElementListCellRenderer<PsiElement>() {
@@ -392,7 +392,10 @@ fun <T> chooseContainerElement(
             onSelect(it)
             true
         }
-    ).showInBestPositionFor(editor)
+    )
+    ApplicationManager.getApplication().invokeLater {
+        popup.showInBestPositionFor(editor)
+    }
 }
 
 fun <T> chooseContainerElementIfNecessary(
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt
index 50f300c979e..8fa695b12d3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt
@@ -57,7 +57,7 @@ fun invokeMoveFilesOrDirectoriesRefactoring(
             val elementsToMove = elements
                 .filterNot {
                     it is PsiFile
-                            && runWriteAction { CopyFilesOrDirectoriesHandler.checkFileExist(selectedDir, choice, it, it.name, "Move") }
+                            && CopyFilesOrDirectoriesHandler.checkFileExist(selectedDir, choice, it, it.name, "Move")
                 }
                 .sortedWith( // process Kotlin files first so that light classes are updated before changing references in Java files
                     java.util.Comparator { o1, o2 ->