diff --git a/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java b/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java
index f0a5d2433e06..0c7749ca7e2c 100644
--- a/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java
+++ b/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java
@@ -2,6 +2,7 @@
 package com.intellij.configurationStore;
 
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.highlighter.ArchiveFileType;
 import com.intellij.ide.util.ElementsChooser;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.application.PathManager;
@@ -153,6 +154,7 @@ public class ChooseComponentsToExportDialog extends DialogWrapper {
     chooserDescriptor.setDescription(description);
     chooserDescriptor.setHideIgnored(false);
     chooserDescriptor.setTitle(title);
+    chooserDescriptor.withFileFilter(file -> ArchiveFileType.INSTANCE.equals(file.getFileType()));
 
     VirtualFile initialDir;
     if (oldPath != null) {
diff --git a/platform/configuration-store-impl/src/ImportSettingsAction.kt b/platform/configuration-store-impl/src/ImportSettingsAction.kt
index 761a4cafd3e9..abd01af80fcb 100644
--- a/platform/configuration-store-impl/src/ImportSettingsAction.kt
+++ b/platform/configuration-store-impl/src/ImportSettingsAction.kt
@@ -68,8 +68,7 @@ open class ImportSettingsAction : AnAction(), DumbAware {
 
   protected open fun doImport(saveFile: Path) {
     if (!saveFile.exists()) {
-      Messages.showErrorDialog(IdeBundle.message("error.cannot.find.file", presentableFileName(saveFile)),
-                               IdeBundle.message("title.file.not.found"))
+      Messages.showErrorDialog(IdeBundle.message("error.cannot.find.file", presentableFileName(saveFile)), IdeBundle.message("title.file.not.found"))
       return
     }