diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt index f5823cfffdd..129517db3d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt @@ -108,7 +108,7 @@ public class KotlinAddImportAction( override fun isAutoSelectionEnabled() = false override fun onChosen(selectedValue: Variant?, finalChoice: Boolean): PopupStep? { - if (selectedValue == null) return null + if (selectedValue == null || project.isDisposed) return null if (finalChoice) { addImport(selectedValue) @@ -123,7 +123,7 @@ public class KotlinAddImportAction( } override fun onChosen(selectedValue: String?, finalChoice: Boolean): PopupStep? { - if (finalChoice) { + if (finalChoice && !project.isDisposed) { AddImportAction.excludeFromImport(project, selectedValue) } return null