diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index 1c013530f209b..af38b3e4bfded 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -83,7 +83,11 @@ public class IntentForwarderActivity extends Activity  {
         String resolvedType = newIntent.resolveTypeIfNeeded(getContentResolver());
         boolean canForward = false;
         try {
-            canForward = ipm.canForwardTo(newIntent, resolvedType, callingUserId,
+            Intent selector = newIntent.getSelector();
+            if (selector == null) {
+                selector = newIntent;
+            }
+            canForward = ipm.canForwardTo(selector, resolvedType, callingUserId,
                     userDest.getIdentifier());
         } catch (RemoteException e) {
             Slog.e(TAG, "PackageManagerService is dead?");