diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 000000000..23d937f3d
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <item type="id" name="categorySpinner" />
+</resources>
\ No newline at end of file
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index ead0e2356..2b546c5e9 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -298,6 +298,9 @@ public class FDroid extends TabActivity implements OnItemClickListener,
                 LinearLayout v = new LinearLayout(FDroid.this);
                 v.setOrientation(LinearLayout.VERTICAL);
                 Spinner cats = new Spinner(FDroid.this);
+                // Giving it an ID lets the default save/restore state
+                // functionality do its stuff.
+                cats.setId(R.id.categorySpinner);
                 cats.setAdapter(categories);
                 cats.setOnItemSelectedListener(FDroid.this);
                 v.addView(cats, new LayoutParams(