diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
index 3d464030..ba216d1d 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
@@ -365,12 +365,7 @@ public class Toolbar extends LinearLayout implements View.OnClickListener {
             AndroidUtils.hideKeyboard(navigationItemContainer);
         }
 
-        if (fromItem != null) {
-            fromItem.toolbar = null;
-        }
-
         toItem.toolbar = this;
-
         toItem.view = createNavigationItemView(toItem);
     }
 
@@ -382,6 +377,7 @@ public class Toolbar extends LinearLayout implements View.OnClickListener {
         item.view.removeAllViews();
         navigationItemContainer.removeView(item.view);
         item.view = null;
+        item.toolbar = null;
     }
 
     private LinearLayout createNavigationItemView(final NavigationItem item) {