diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
index 124c974c..a7db11d9 100644
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -110,7 +110,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     populateAppGridWithCache();
 
                     getFragmentManager().beginTransaction()
-                            .add(R.id.appFragmentContainer, new AdapterFragment()).commitAllowingStateLoss();
+                            .replace(R.id.appFragmentContainer, new AdapterFragment())
+                            .commitAllowingStateLoss();
                 }
             }.start();
         }
diff --git a/app/src/main/java/com/limelight/PcView.java b/app/src/main/java/com/limelight/PcView.java
index 7466e344..76b44642 100644
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -49,7 +49,6 @@ import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
 public class PcView extends Activity implements AdapterFragmentCallbacks {
-    private AdapterFragment adapterFragment;
     private RelativeLayout noPcFoundLayout;
     private PcGridAdapter pcGridAdapter;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
@@ -122,14 +121,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             }
         });
 
-        FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        if (adapterFragment != null) {
-            // Remove the old fragment
-            transaction.remove(adapterFragment);
-        }
-        adapterFragment = new AdapterFragment();
-        transaction.add(R.id.pcFragmentContainer, adapterFragment);
-        transaction.commitAllowingStateLoss();
+        getFragmentManager().beginTransaction()
+            .replace(R.id.pcFragmentContainer, new AdapterFragment())
+            .commitAllowingStateLoss();
 
         noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
         if (pcGridAdapter.getCount() == 0) {