diff --git a/ext/bg/background.html b/ext/bg/background.html
index 3ecfa3dc..625917ef 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -4,6 +4,7 @@
+
diff --git a/ext/bg/js/gecko.js b/ext/bg/js/gecko.js
new file mode 100644
index 00000000..a39610ff
--- /dev/null
+++ b/ext/bg/js/gecko.js
@@ -0,0 +1,18 @@
+console.log('blah');
+
+//
+// Gecko does not currently support chrome.storage.sync, use storage.local instead
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1220494
+if (!chrome.storage.sync) {
+ chrome.storage.sync = chrome.storage.local;
+}
+
+// Gecko does not currently support chrome.runtime.onInstalled, just ignore calls to it
+// (https://bugzilla.mozilla.org/show_bug.cgi?id=1252871)
+if (!chrome.runtime.onInstalled) {
+ chrome.runtime.onInstalled = {
+ 'addListener' : function(){},
+ 'hasListener' : function(){},
+ 'removeListener' : function(){}
+ };
+}
diff --git a/ext/bg/options.html b/ext/bg/options.html
index bef053d0..e5b0cbca 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -232,6 +232,7 @@
+