diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index eb911a9..80fda6d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -450,6 +450,11 @@
         return (categories != null) && categories.contains("com.android.settings.SHORTCUT");
     }
 
+    private static boolean isAppInfoIntent(final Intent intent) {
+        String action = intent.getAction();
+        return (action != null) && action.equals("android.settings.APPLICATION_DETAILS_SETTINGS");
+    }
+
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
@@ -472,7 +477,7 @@
         // Getting Intent properties can only be done after the super.onCreate(...)
         final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
 
-        mIsShortcut = isShortCutIntent(intent) ||
+        mIsShortcut = isShortCutIntent(intent) || isAppInfoIntent(intent) ||
                 intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);
 
         mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut;
