diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java
index 1b765ed38512..12106017ead3 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java
@@ -13,10 +13,19 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 public class IntellijConfigOptionDescriptorProvider implements EditorConfigOptionDescriptorProvider {
 
+  /**
+   * Properties not supported currently in EditorConfig
+   */
+  private final static Set<String> UNSUPPORTED_PROPERTIES = ContainerUtil.newHashSet();
+  static {
+    UNSUPPORTED_PROPERTIES.add("imports_layout");
+    UNSUPPORTED_PROPERTIES.add("packages_to_use_import_on_demand");
+  }
+
   @NotNull
   @Override
   public List<EditorConfigOptionDescriptor> getOptionDescriptors() {
@@ -37,6 +46,7 @@ public class IntellijConfigOptionDescriptorProvider implements EditorConfigOptio
     CodeStylePropertiesUtil.collectMappers(CodeStyle.getDefaultSettings(), mapper -> mappers.add(mapper));
     for (AbstractCodeStylePropertyMapper mapper : mappers) {
       for (String property : mapper.enumProperties()) {
+        if (UNSUPPORTED_PROPERTIES.contains(property)) continue;
         List<String> ecNames = EditorConfigIntellijNameUtil.toEditorConfigNames(mapper, property);
         final EditorConfigDescriptor valueDescriptor = createValueDescriptor(property, mapper);
         if (valueDescriptor != null) {