diff --git a/contributors/dcoles.md b/contributors/dcoles.md
new file mode 100644
index 00000000..4b47257f
--- /dev/null
+++ b/contributors/dcoles.md
@@ -0,0 +1,11 @@
+2018-11-13
+
+I hereby agree to the terms of the "Markdown Here Individual Contributor License
+Agreement", with MD5 checksum 6a31e08cf66139e91c0db5599b6ab084.
+
+I furthermore declare that I am authorized and able to make this agreement and
+sign this declaration.
+
+Signed,
+
+David Coles https://github.com/dcoles
diff --git a/src/chrome/backgroundscript.js b/src/chrome/backgroundscript.js
index 9c1c4372..871b4ca3 100644
--- a/src/chrome/backgroundscript.js
+++ b/src/chrome/backgroundscript.js
@@ -51,12 +51,42 @@ function upgradeCheck() {
   });
 }
 
+// Load content script dependencies.
+function loadContentScripts(done) {
+  chrome.tabs.executeScript(
+      {code: 'document.markdown_here_loaded'}, function(results) {
+    if (results[0]) {
+      done();
+      return;
+    }
+
+    let srcs = [
+      "common/utils.js",
+      "common/common-logic.js",
+      "common/jsHtmlToText.js",
+      "common/marked.js",
+      "common/mdh-html-to-text.js",
+      "common/markdown-here.js",
+      "chrome/contentscript.js"
+    ];
+
+    for (let i=0; i<srcs.length; i++) {
+      chrome.tabs.executeScript({file: srcs[i]});
+    }
+
+    chrome.tabs.executeScript(
+        {code: 'document.markdown_here_loaded = true'}, done);
+  });
+}
+
 // Create the context menu that will signal our main code.
 chrome.contextMenus.create({
   contexts: ['editable'],
   title: Utils.getMessage('context_menu_item'),
   onclick: function(info, tab) {
-    chrome.tabs.sendMessage(tab.id, {action: 'context-click'});
+    loadContentScripts(function() {
+      chrome.tabs.sendMessage(tab.id, {action: 'context-click'});
+    });
   }
 });
 
@@ -149,7 +179,9 @@ chrome.runtime.onMessage.addListener(function(request, sender, responseCallback)
 
 // Add the browserAction (the button in the browser toolbar) listener.
 chrome.browserAction.onClicked.addListener(function(tab) {
-  chrome.tabs.sendMessage(tab.id, {action: 'button-click', });
+  loadContentScripts(function() {
+    chrome.tabs.sendMessage(tab.id, {action: 'button-click', });
+  });
 });
 
 
diff --git a/src/manifest.json b/src/manifest.json
index f3c5af49..b279cafa 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -12,22 +12,8 @@
     "128": "common/images/icon128.png",
     "512": "common/images/icon512.png"
   },
-  "permissions": ["contextMenus", "storage"],
+  "permissions": ["contextMenus", "storage", "activeTab"],
   "background": {"page": "chrome/background.html"},
-  "content_scripts": [
-    {
-      "matches": ["http://*/*", "https://*/*"],
-      "js": [
-        "common/utils.js",
-        "common/common-logic.js",
-        "common/jsHtmlToText.js",
-        "common/marked.js",
-        "common/mdh-html-to-text.js",
-        "common/markdown-here.js",
-        "chrome/contentscript.js"
-        ]
-    }
-  ],
   "browser_action": {
     "default_icon": {
       "16": "common/images/icon16-button-monochrome.png",