diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java
index bf174a7f284c..a3855b676571 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java
@@ -47,22 +47,22 @@ class AvailablePluginColumnInfo extends PluginManagerColumnInfo {
 
   @Override
   protected boolean isSortByName() {
-    return mySortMode == PluginTableModel.NAME;
+    return mySortMode.equals(PluginTableModel.NAME);
   }
 
   @Override
   protected boolean isSortByDownloads() {
-    return mySortMode == AvailablePluginsTableModel.DOWNLOADS;
+    return mySortMode.equals(AvailablePluginsTableModel.DOWNLOADS);
   }
 
   @Override
   protected boolean isSortByDate() {
-    return mySortMode == AvailablePluginsTableModel.RELEASE_DATE;
+    return mySortMode.equals(AvailablePluginsTableModel.RELEASE_DATE);
   }
 
   @Override
   protected boolean isSortByStatus() {
-    return mySortMode == AvailablePluginsTableModel.STATUS;
+    return mySortMode.equals(AvailablePluginsTableModel.STATUS);
   }
 
   public void setSortMode(String sortMode) {
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginsTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginsTableModel.java
index 26e6d842877c..1cf08921faab 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginsTableModel.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginsTableModel.java
@@ -88,7 +88,7 @@ public class AvailablePluginsTableModel extends PluginTableModel {
 
   @Override
   public boolean isPluginDescriptorAccepted(IdeaPluginDescriptor descriptor) {
-    if (myCategory == ALL) return true;
+    if (myCategory.equals(ALL)) return true;
     final String category = descriptor.getCategory();
     return category == null || category.equals(myCategory);
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
index ded066268f39..4b733ae66880 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
@@ -169,6 +169,7 @@ public abstract class PluginManagerMain implements Disposable {
     else {
       pluginsModel.modifyData(list);
     }
+    pluginsModel.sort();
     pluginsList = list;
     if (selected != null) {
       select(selected);
@@ -209,7 +210,6 @@ public abstract class PluginManagerMain implements Disposable {
               modifyPluginsList(list);
               propagateUpdates(list);
               setDownloadStatus(false);
-              pluginsModel.setSortMode(myUISettings.AVAILABLE_SORT_MODE);
             }
             else if (error != null) {
               LOG.info(error);
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginTableModel.java
index d7654b98adaa..67a0ad94c736 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginTableModel.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginTableModel.java
@@ -153,7 +153,7 @@ abstract public class PluginTableModel extends AbstractTableModel implements Sor
 
   public abstract boolean isPluginDescriptorAccepted(IdeaPluginDescriptor descriptor);
 
-  private void sort() {
+  protected void sort() {
     Collections.sort(view, columns[getNameColumn()].getComparator());
     fireTableDataChanged();
   }