diff --git a/src/org/fdroid/fdroid/AppListManager.java b/src/org/fdroid/fdroid/AppListManager.java
index 59f66f161..20228de68 100644
--- a/src/org/fdroid/fdroid/AppListManager.java
+++ b/src/org/fdroid/fdroid/AppListManager.java
@@ -215,7 +215,10 @@ public class AppListManager {
     }
 
     public void setCurrentCategory(String currentCategory) {
-        this.currentCategory = currentCategory;
+        if (!this.currentCategory.equals(currentCategory)){
+            this.currentCategory = currentCategory;
+            repopulateLists();
+        }
     }
 
     static class WhatsNewComparator implements Comparator<DB.App> {
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 6ad8f9588..33ef1b060 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -13,7 +13,6 @@ import org.fdroid.fdroid.views.AppListView;
 
 abstract class AppListFragment extends Fragment implements AdapterView.OnItemClickListener {
 
-    private AppListManager appListManager;
     private FDroid parent;
 
     protected abstract AppListAdapter getAppListAdapter();
diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 517476e79..f513e3f13 100644
--- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -51,8 +51,8 @@ public class AvailableAppsFragment extends AppListFragment implements AdapterVie
 
     public void onItemSelected(AdapterView<?> parent, View view, int pos,
             long id) {
-        getAppListManager().setCurrentCategory(parent.getItemAtPosition(pos).toString());
-        getAppListManager().repopulateLists();
+        String category = parent.getItemAtPosition(pos).toString();
+        getAppListManager().setCurrentCategory(category);
     }
 
     @Override