diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 9cb518cfe2e79..e8ba8f3f4125f 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -172,7 +172,6 @@ public class PipMenuActivity extends Activity {
 
         updateFromIntent(getIntent());
         setTitle(R.string.pip_menu_title);
-        notifyActivityCallback(mMessenger);
     }
 
     @Override
@@ -306,6 +305,7 @@ public class PipMenuActivity extends Activity {
 
     private void updateFromIntent(Intent intent) {
         mToControllerMessenger = intent.getParcelableExtra(EXTRA_CONTROLLER_MESSENGER);
+        notifyActivityCallback(mMessenger);
         ParceledListSlice actions = intent.getParcelableExtra(EXTRA_ACTIONS);
         if (actions != null) {
             mActions.clear();