diff --git a/background.js b/background.js
index 1ad6aac..93ad96e 100644
--- a/background.js
+++ b/background.js
@@ -1,6 +1,13 @@
-
+var buffer = [];
+function addToBuffer(message) {
+  buffer.push(message);
+}
+chrome.runtime.onMessage.addListener(addToBuffer);
 chrome.runtime.onConnect.addListener(function(port) {
-
+  chrome.runtime.onMessage.removeListener(addToBuffer);
+  buffer.forEach(function(msg) {
+    port.postMessage(msg);
+  });
   // context script –> background
   chrome.runtime.onMessage.addListener(function(msg, sender, sendResponse) {
     port.postMessage(msg);