diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
index 1c78f0835e8f..e3cd02bcef3f 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
@@ -317,7 +317,7 @@ public class JdkComboBox extends ComboBoxWithWidePopup {
         }
       }
 
-      return comparatorToSdkMap.entrySet().stream().flatMap(entry -> ContainerUtil.sorted(entry.getValue(), entry.getKey()).stream())
+      return comparatorToSdkMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().sorted(entry.getKey()))
         .toArray(size -> new Sdk[size]);
     }
 
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java
index 1d1d93fcf3fa..15c81e4a7e68 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java
@@ -97,7 +97,7 @@ public abstract class SdkType implements SdkTypeId {
    * If different sdk types return the same comparator object then they are sorted together.
    */
 
-  public Comparator<Sdk> getComparator(){
+  public Comparator<Sdk> getComparator() {
     return ALPHABETICAL_COMPARATOR;
   }