diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index acb86c70552..51a5edd726f 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1274,7 +1274,14 @@ public class SettingsActivity extends SettingsDrawerActivity
     }
 
     public void startSuggestion(Intent intent) {
-        mCurrentSuggestion = intent.getComponent();
+        if (intent == null) {
+            return;
+        }
+        final ComponentName componentName = intent.getComponent();
+        if (componentName.equals(mCurrentSuggestion)) {
+            return;
+        }
+        mCurrentSuggestion = componentName;
         startActivityForResult(intent, REQUEST_SUGGESTION);
     }