diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 20dd1b811bba..2b97d3e00b92 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -326,7 +326,8 @@
               <richlistitem id="addons-local" class="section-header" align="center">
                 <label value="&addonsLocal.label;" flex="1"/>
                 <spacer flex="1"/>
-                <button class="button-dark" label="&addonsUpdate.label;" oncommand="ExtensionsView.updateAll();"/>
+                <button id="addons-update-all" class="button-dark" label="&addonsUpdate.label;"
+                        oncommand="ExtensionsView.updateAll();"/>
               </richlistitem>
               <richlistitem id="addons-repo" class="section-header">
                 <label value="&addonsRepo.label;" flex="1"/>
diff --git a/mobile/chrome/content/extensions.js b/mobile/chrome/content/extensions.js
index 1f2b9f27e776..56b7a01c2eaf 100644
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -296,6 +296,7 @@ var ExtensionsView = {
     if (items.length == 0) {
       let strings = document.getElementById("bundle_browser");
       this.displaySectionMessage("local", strings.getString("addonsLocalNone.label"), null, true);
+      document.getElementById("addons-update-all").disabled = true;
     }
 
     for (let i = 0; i < items.length; i++) {
@@ -524,7 +525,7 @@ var ExtensionsView = {
     let end = this._repoItem;
 
     while (start != end) {
-      if (start.getAttribute("updateable") != "false")
+      if (start.getAttribute("updateable") == "true")
         items.push(this._extmgr.getItemForID(start.getAttribute("addonID")));
       start = start.nextSibling;
     }
diff --git a/mobile/themes/hildon/browser.css b/mobile/themes/hildon/browser.css
index 974cd4d5e4c8..b4632310c6f8 100644
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@@ -359,6 +359,14 @@ toolbarbutton.page-button {
   }
 }
 
+#addons-update-all {
+  color: #000 !important;
+}
+
+#addons-update-all[disabled="true"] {
+  color: #aaa !important;
+}
+
 .addon-rating[rating] {
   width: 78px;
   height: 18px;
diff --git a/mobile/themes/wince/browser.css b/mobile/themes/wince/browser.css
index 796b9726164c..cd8f601af07e 100644
--- a/mobile/themes/wince/browser.css
+++ b/mobile/themes/wince/browser.css
@@ -184,6 +184,14 @@ toolbarbutton.page-button {
   }
 }
 
+#addons-update-all {
+  color: #000 !important;
+}
+
+#addons-update-all[disabled="true"] {
+  color: #aaa !important;
+}
+
 /* console panel UI   ------------------------------------------------------ */
 @media (orientation: landscape) {
   #console-filter-warnings,