diff --git a/mobile/android/base/prompts/IconGridInput.java b/mobile/android/base/prompts/IconGridInput.java
index d8dfadecef0b..2701d6fa16c2 100644
--- a/mobile/android/base/prompts/IconGridInput.java
+++ b/mobile/android/base/prompts/IconGridInput.java
@@ -38,7 +38,7 @@ public class IconGridInput extends PromptInput implements OnItemClickListener {
     private static int mColumnWidth = -1;  // The maximum width of columns
     private static int mMaxColumns = -1;  // The maximum number of columns to show
     private static int mIconSize = -1;    // Size of icons in the grid
-    private int mSelected = 0;           // Current selection, default to first item
+    private int mSelected = -1;           // Current selection
     private JSONArray mArray;
 
     public IconGridInput(JSONObject obj) {
@@ -76,6 +76,7 @@ public class IconGridInput extends PromptInput implements OnItemClickListener {
             items.add(item);
             if (item.selected) {
                 mSelected = i;
+                view.setSelection(i);
             }
         }
 
@@ -84,8 +85,6 @@ public class IconGridInput extends PromptInput implements OnItemClickListener {
 
         mAdapter = new IconGridAdapter(context, -1, items);
         view.setAdapter(mAdapter);
-        view.setItemChecked(mSelected, true);
-
         mView = view;
         return mView;
     }
diff --git a/mobile/android/components/HelperAppDialog.js b/mobile/android/components/HelperAppDialog.js
index 832596b608bc..c303c8d49d64 100644
--- a/mobile/android/components/HelperAppDialog.js
+++ b/mobile/android/components/HelperAppDialog.js
@@ -134,7 +134,6 @@ HelperAppLauncherDialog.prototype = {
       name: bundle.GetStringFromName("helperapps.saveToDisk"),
       packageName: "org.mozilla.gecko.Download",
       iconUri: "drawable://icon",
-      selected: true, // Default to download for all files
       launch: function() {
         // Reset the preferredAction here.
         aLauncher.MIMEInfo.preferredAction = Ci.nsIMIMEInfo.saveToDisk;