diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
index 39d2bfd204c2..98f37254ea68 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.kt
@@ -205,7 +205,9 @@ class FileEditorProviderManagerImpl
     }
 
     updateState {
-      FileEditorProviderManagerState(it.selectedProviders + (computeKey(list) to composite.selectedWithProvider!!.provider.editorTypeId))
+      val selectedWithProvider = composite.selectedWithProvider
+      val selected = if (selectedWithProvider == null) it.selectedProviders else it.selectedProviders + (computeKey(list) to selectedWithProvider.provider.editorTypeId)
+      FileEditorProviderManagerState(selected)
     }
   }