--- a/toolkit/components/extensions/ext-storage.js
+++ b/toolkit/components/extensions/ext-storage.js
@@ -3,48 +3,37 @@
 var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionStorage",
                                   "resource://gre/modules/ExtensionStorage.jsm");
 
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 var {
   EventManager,
-  runSafe,
 } = ExtensionUtils;
 
 extensions.registerPrivilegedAPI("storage", (extension, context) => {
   return {
     storage: {
       local: {
         get: function(keys, callback) {
-          ExtensionStorage.get(extension.id, keys).then(result => {
-            runSafe(context, callback, result);
-          });
+          return context.wrapPromise(
+            ExtensionStorage.get(extension.id, keys), callback);
         },
         set: function(items, callback) {
-          ExtensionStorage.set(extension.id, items).then(() => {
-            if (callback) {
-              runSafe(context, callback);
-            }
-          });
+          return context.wrapPromise(
+            ExtensionStorage.set(extension.id, items), callback);
         },
         remove: function(items, callback) {
-          ExtensionStorage.remove(extension.id, items).then(() => {
-            if (callback) {
-              runSafe(context, callback);
-            }
-          });
+          return context.wrapPromise(
+            ExtensionStorage.remove(extension.id, items), callback);
         },
         clear: function(callback) {
-          ExtensionStorage.clear(extension.id).then(() => {
-            if (callback) {
-              runSafe(context, callback);
-            }
-          });
+          return context.wrapPromise(
+            ExtensionStorage.clear(extension.id), callback);
         },
       },
 
       onChanged: new EventManager(context, "storage.local.onChanged", fire => {
         let listener = changes => {
           fire(changes, "local");
         };