diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 02cd9dd90..c3d1206ab 100644
--- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -103,6 +103,7 @@ public class AvailableAppsFragment extends AppListFragment implements
         categorySpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+                getListView().setSelection(0);
                 setCurrentCategory(categories.get(pos));
             }
             @Override
@@ -156,7 +157,6 @@ public class AvailableAppsFragment extends AppListFragment implements
         currentCategory = category;
         Log.d("FDroid", "Category '" + currentCategory + "' selected.");
         getLoaderManager().restartLoader(0, null, AvailableAppsFragment.this);
-        getListView().setSelection(0);
     }
 
     @Override