--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -2145,30 +2145,31 @@ public abstract class GeckoApp extends G
         }
     }
 
     @Override
     protected void onNewIntent(Intent externalIntent) {
         super.onNewIntent(externalIntent);
 
         final SafeIntent intent = new SafeIntent(externalIntent);
+        final String action = intent.getAction();
 
         final boolean isFirstTab = !mWasFirstTabShownAfterActivityUnhidden;
         mWasFirstTabShownAfterActivityUnhidden = true; // Reset since we'll be loading a tab.
-        mIgnoreLastSelectedTab = true;
+        if (!Intent.ACTION_MAIN.equals(action)) {
+            mIgnoreLastSelectedTab = true;
+        }
 
         // if we were previously OOM killed, we can end up here when launching
         // from external shortcuts, so set this as the intent for initialization
         if (!mInitialized) {
             setIntent(externalIntent);
             return;
         }
 
-        final String action = intent.getAction();
-
         final String uri = getURIFromIntent(intent);
         final String passedUri;
         if (!TextUtils.isEmpty(uri)) {
             passedUri = uri;
         } else {
             passedUri = null;
         }