diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7879d0c9885..23dc6a73bd2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,6 +71,12 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubSettings"
+                android:taskAffinity="com.android.settings"
+                android:theme="@android:style/Theme.Holo"
+                >
+        </activity>
+
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
             android:theme="@style/Theme.CreateShortCut">
             <intent-filter>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 25327475cbd..c64004bf2f6 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -229,6 +229,13 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
         return super.onGetInitialHeader();
     }
 
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args);
+        intent.setClass(this, SubSettings.class);
+        return intent;
+    }
+    
     /**
      * Populate the activity with the top-level headers.
      */