diff --git a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
index e4e60a3e3591..5efdaf1bbc44 100644
--- a/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+++ b/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
@@ -7791,11 +7791,26 @@ ExtensionsDataSource.prototype = {
 
   /**
    * If we're in safe mode, the item is disabled by the user or app, or the
-   * item is to be upgraded force the generic about dialog for the item.
+   * item is to not an extension then don't offer an options url.
+   */
+  _rdfGet_optionsURL: function EMDS__rdfGet_optionsURL(item, property) {
+    var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
+    if (inSafeMode() || this.getItemProperty(id, "isDisabled") == "true" ||
+        this.getItemProperty(id, "type") != Ci.nsIUpdateItem.TYPE_EXTENSION)
+      return EM_L("");
+
+    return null;
+  },
+
+  /**
+   * If we're in safe mode, the item is disabled by the user or app, the item
+   * is not an extension, or the item is to be upgraded force the generic about
+   * dialog for the item.
    */
   _rdfGet_aboutURL: function EMDS__rdfGet_aboutURL(item, property) {
     var id = stripPrefix(item.Value, PREFIX_ITEM_URI);
     if (inSafeMode() || this.getItemProperty(id, "isDisabled") == "true" ||
+        this.getItemProperty(id, "type") != Ci.nsIUpdateItem.TYPE_EXTENSION ||
         this.getItemProperty(id, "opType") == OP_NEEDS_UPGRADE)
       return EM_L("");
 
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf
new file mode 100644
index 000000000000..46d88eaec03b
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bug371495@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>1</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    
+    <!-- Front End MetaData -->
+    <em:name>Test theme</em:name>
+    <em:type>4</em:type>
+    <em:optionsURL>chrome://foo/content/bar.xul</em:optionsURL>
+    <em:aboutURL>chrome://foo/content/bar.xul</em:aboutURL>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/unit/test_bug371495.js b/toolkit/mozapps/extensions/test/unit/test_bug371495.js
new file mode 100644
index 000000000000..31126c4e166d
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/unit/test_bug371495.js
@@ -0,0 +1,64 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ *      Dave Townsend <dtownsend@oxymoronical.com>.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+const PREF_MATCH_OS_LOCALE = "intl.locale.matchOS";
+const PREF_SELECTED_LOCALE = "general.useragent.locale";
+
+const ADDON = "test_bug371495";
+const ID = "bug371495@tests.mozilla.org";
+
+function run_test()
+{
+  // Setup for test
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
+
+  // Install test add-on
+  startupEM();
+  gEM.installItemFromFile(do_get_addon(ADDON), NS_INSTALL_LOCATION_APPPROFILE);
+  var addon = gEM.getItemForID(ID);
+  do_check_neq(addon, null);
+  do_check_eq(addon.name, "Test theme");
+  restartEM();
+
+  addon = gEM.getItemForID(ID);
+  do_check_neq(addon, null);
+  do_check_eq(getManifestProperty(ID, "optionsURL"), "");
+  do_check_eq(getManifestProperty(ID, "aboutURL"), "");
+
+  shutdownEM();
+}