diff --git a/res/layout/privacy_guard_manager.xml b/res/layout/privacy_guard_manager.xml
index 15328f6eaa5..e119ecac2d3 100644
--- a/res/layout/privacy_guard_manager.xml
+++ b/res/layout/privacy_guard_manager.xml
@@ -18,9 +18,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <fragment
+    <FrameLayout
         android:id="@+id/privacy_guard_prefs"
-        android:name="com.android.settings.privacyguard.PrivacyGuardPrefs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <View
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
index c1d4c0e514d..5ecaf6bdba4 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.privacyguard;
 
+import android.app.FragmentTransaction;
 import android.view.animation.AnimationUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -84,6 +85,9 @@ public class PrivacyGuardManager extends Fragment
     private final static String LAST_LIST_POS = "last_list_pos";
     private final static String LAST_LIST_OFFSET = "last_list_offset";
 
+    // Privacy Guard Fragment
+    private final static String PRIVACY_GUARD_FRAGMENT_TAG = "privacy_guard_fragment";
+
     // holder for package data passed into the adapter
     public static final class AppInfo {
         String title;
@@ -96,21 +100,17 @@ public static final class AppInfo {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-
         mActivity = getActivity();
         mAppOps = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
 
-        return inflater.inflate(R.layout.privacy_guard_manager, container, false);
-    }
+        View hostView = inflater.inflate(R.layout.privacy_guard_manager, container, false);
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        FragmentManager fm = getFragmentManager();
-        Fragment f = fm.findFragmentById(R.id.privacy_guard_prefs);
-        if (f != null && !fm.isDestroyed()) {
-            fm.beginTransaction().remove(f).commit();
-        }
+        Fragment privacyGuardPrefs = PrivacyGuardPrefs.newInstance();
+        FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.privacy_guard_prefs, privacyGuardPrefs,
+                PRIVACY_GUARD_FRAGMENT_TAG);
+        fragmentTransaction.commit();
+        return hostView;
     }
 
     @Override
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java b/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
index 54b0edf807c..9a547cfbde6 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
@@ -16,15 +16,11 @@
 
 package com.android.settings.privacyguard;
 
-import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,12 +40,16 @@ public class PrivacyGuardPrefs extends SettingsPreferenceFragment implements
 
     private SwitchPreference mPrivacyGuardDefault;
 
+    public static PrivacyGuardPrefs newInstance() {
+        PrivacyGuardPrefs privacyGuardFragment = new PrivacyGuardPrefs();
+        return privacyGuardFragment;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         addPreferencesFromResource(R.xml.privacy_guard_prefs);
-        PreferenceScreen prefSet = getPreferenceScreen();
 
         mPrivacyGuardDefault = (SwitchPreference) findPreference(KEY_PRIVACY_GUARD_DEFAULT);
         mPrivacyGuardDefault.setOnPreferenceChangeListener(this);