diff --git a/src/background/index.js b/src/background/index.js
index b2182f0..171f90e 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -17,10 +17,7 @@ const keyPressHandle = (request, sender) => {
   if (actions.isBackgroundAction(action.type)) {
     return doBackgroundAction(sender, action);
   } else if (actions.isContentAction(action.type)) {
-    return Promise.resolve({
-      type: 'response.action',
-      action: action
-    });
+    return browser.tabs.sendMessage(sender.tab.id, action);
   }
   return Promise.resolve();
 };
diff --git a/src/content/index.js b/src/content/index.js
index 27dc581..d5cca94 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -7,7 +7,8 @@ import Follow from './follow';
 
 let vvConsole = new ConsoleFrame(window);
 
-const doAction = (action) => {
+
+browser.runtime.onMessage.addListener((action) => {
   switch (action.type) {
   case actions.CMD_OPEN:
     vvConsole.showCommand('');
@@ -51,19 +52,8 @@ const doAction = (action) => {
     histories.next(window);
     break;
   }
-}
-
-const handleResponse = (response) => {
-  if (!response) {
-    return;
-  }
-
-  switch(response.type) {
-  case 'response.action':
-    doAction(response.action);
-    break;
-  }
-};
+  return Promise.resolve();
+});
 
 window.addEventListener("keypress", (e) => {
   if (e.target instanceof HTMLInputElement) {
@@ -77,7 +67,6 @@ window.addEventListener("keypress", (e) => {
   }
 
   browser.runtime.sendMessage(request)
-    .then(handleResponse)
     .catch((err) => {
       console.error("Vim Vixen:", err);
       vvConsole.showError(err.message);