diff --git a/app/src/main/java/net/i2p/android/router/ConsoleContainer.java b/app/src/main/java/net/i2p/android/router/ConsoleContainer.java
index 7f7fa6d91..48f36bf34 100644
--- a/app/src/main/java/net/i2p/android/router/ConsoleContainer.java
+++ b/app/src/main/java/net/i2p/android/router/ConsoleContainer.java
@@ -27,7 +27,7 @@ public class ConsoleContainer extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.container_console, container, false);
         // Start with the home view
-        if (savedInstanceState == null) {
+        if (savedInstanceState == null && getChildFragmentManager().findFragmentById(R.id.main_fragment) == null) {
             mMainFragment = new MainFragment();
             mMainFragment.setArguments(getActivity().getIntent().getExtras());
             getChildFragmentManager().beginTransaction()
diff --git a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookContainer.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookContainer.java
index a447ede06..f752ddd43 100644
--- a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookContainer.java
+++ b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookContainer.java
@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.SearchView;
@@ -50,10 +51,12 @@ public class AddressbookContainer extends Fragment
             mTwoPane = true;
 
             // Set up the two pages
-            getChildFragmentManager().beginTransaction()
-                    .add(R.id.left_fragment, AddressbookFragment.newInstance(AddressbookFragment.ROUTER_BOOK))
-                    .add(R.id.right_fragment, AddressbookFragment.newInstance(AddressbookFragment.PRIVATE_BOOK))
-                    .commit();
+            FragmentTransaction ft = getChildFragmentManager().beginTransaction();
+            if (getChildFragmentManager().findFragmentById(R.id.left_fragment) == null)
+                ft.add(R.id.left_fragment, AddressbookFragment.newInstance(AddressbookFragment.ROUTER_BOOK));
+            if (getChildFragmentManager().findFragmentById(R.id.right_fragment) == null)
+                ft.add(R.id.right_fragment, AddressbookFragment.newInstance(AddressbookFragment.PRIVATE_BOOK));
+            ft.commit();
         } else {
             ViewPager viewPager = (ViewPager) v.findViewById(R.id.pager);
             mFragPagerAdapter = new AddressbookPagerAdapter(getActivity(), getChildFragmentManager());