diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 29ac4f8..a56ce0d 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -141,7 +141,6 @@
             // overlaid by the action bar of the newly-created fragment.
             stopSearchAndSelection();
             updateStatusBarBackground();
-            initializeAssistantNewBadge();
         }
 
         private void stopSearchAndSelection() {
@@ -184,6 +183,7 @@
                 mRunnable.run();
                 mRunnable = null;
             }
+            initializeAssistantNewBadge();
         }
 
         public void runWhenIdle(Runnable runnable) {
@@ -264,7 +264,8 @@
     }
 
     private void initializeAssistantNewBadge() {
-        if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
+        if (!Flags.getInstance().getBoolean(Experiments.ASSISTANT)
+                || mNavigationView == null) {
             return;
         }
         final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(