diff --git a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
index d1c81fe60b314819f2dcf1021201128d4ad0c956..cd7b9d04fdf17beb8c61d69711ec376ba48e775f 100644
--- a/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
+++ b/app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java
@@ -173,15 +173,19 @@ public class AddressbookFragment extends ListFragment implements
         inflater.inflate(R.menu.fragment_addressbook_actions, menu);
 
         mSearchAddressbook = menu.findItem(R.id.action_search_addressbook);
+    }
 
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
         // Hide until needed
         if (getRouterContext() == null) {
             mSearchAddressbook.setVisible(false);
-            mAddToAddressbook.setVisibility(View.GONE);
+            if (mAddToAddressbook != null)
+                mAddToAddressbook.setVisibility(View.GONE);
         }
 
         // Only allow adding to private book 
-        if (!PRIVATE_BOOK.equals(mBook)) {
+        if (!PRIVATE_BOOK.equals(mBook) && mAddToAddressbook != null) {
             mAddToAddressbook.setVisibility(View.GONE);
             mAddToAddressbook = null;
         }