newtab.diff

diff --git a/data/newtabicons-content.js b/data/newtabicons-content.js
index e2a9acb..b01fdbe 100644
--- a/data/newtabicons-content.js
+++ b/data/newtabicons-content.js
@@ -139,5 +139,7 @@ function overrideToggle() {
   });
 }
 
-addThumbnails(window.document.getElementsByClassName('newtab-cell'));
-overrideToggle();
\ No newline at end of file
+window.addEventListener('load', function () {
+    addThumbnails(window.document.getElementsByClassName('newtab-cell'));
+  overrideToggle();
+}, false);
\ No newline at end of file
diff --git a/lib/newtabicons.js b/lib/newtabicons.js
index f58baec..96fe533 100644
--- a/lib/newtabicons.js
+++ b/lib/newtabicons.js
@@ -15,6 +15,7 @@ var cm = require('sdk/context-menu');
 var Etherpad = require('./etherpad').Etherpad;
 var etherpad = new Etherpad('thumbnail-gifs');
 var prefs = require('sdk/simple-prefs');
+var PrefSvc = require('sdk/preferences/service');
 var privateBrowsing = require('sdk/private-browsing');
 var self = require('sdk/self');
 var tabs = require('sdk/tabs');
@@ -137,6 +138,8 @@ var listener = function () {
 };
 
 exports.load = function () {
+  prefs.prefs.browser_newtab_preload = PrefSvc.isSet('browser.newtab.preload');
+  PrefSvc.set('browser.newtab.preload', false);
   prefs.on('newtabicons2', listener);
   run();
   listener('newtabicons2');
@@ -145,4 +148,5 @@ exports.load = function () {
 exports.unload = function () {
   prefs.removeListener('newtabicons2', listener);
   tabs.removeListener('ready', tabReady);
+  PrefSvc.set('browser.newtab.preload', prefs.prefs.browser_newtab_preload);
 };
diff --git a/lib/ponami.js b/lib/ponami.js
index 3fbf052..1075631 100644
--- a/lib/ponami.js
+++ b/lib/ponami.js
@@ -13,7 +13,6 @@
 
 var image = require('./ponami-image.js').image;
 var prefs = require('sdk/simple-prefs');
-var PrefSvc = require('sdk/preferences/service');
 var self = require('sdk/self');
 var windowUtils = require('sdk/deprecated/window-utils');
 
@@ -83,13 +82,10 @@ var listener = function (prefName) {
 };
 
 exports.load = function () {
-  prefs.prefs.browser_newtab_preload = PrefSvc.isSet('browser.newtab.preload');
-  PrefSvc.set('browser.newtab.preload', false);
   prefs.on('ponami', listener);
   listener('ponami');
 };
 
 exports.unload = function () {
   prefs.removeListener('ponami', listener);
-  PrefSvc.set('browser.newtab.preload', prefs.prefs.browser_newtab_preload);
 };
diff --git a/package.json b/package.json
index 6f1c791..a8716b3 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
   "bugs": {},
   "amd": {},
   "repository": {},
-  "version": "1.0.5",
+  "version": "1.0.6",
   "contributors": [
     "Bryan Clark",
     "Mike Conley",