4 files changed, 25 insertions, 2 deletions
diff --git a/src/actions/tab.js b/src/actions/tab.js
new file mode 100644
index 0000000..e512b6f
--- /dev/null
+++ b/src/actions/tab.js
@@ -0,0 +1,9 @@
+const openNewTab = (url) => {
+  return browser.tabs.create({ url: url });
+};
+
+const openToTab = (url, tab) => {
+  return browser.tabs.update(tab.id, { url: url });
+};
+
+export { openToTab, openNewTab };
diff --git a/src/background/index.js b/src/background/index.js
index a4217c1..9df22fd 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -3,6 +3,7 @@ import * as inputActions from '../actions/input';
 import * as operationActions from '../actions/operation';
 import * as commandActions from '../actions/command';
 import * as consoleActions from '../actions/console';
+import * as tabActions from '../actions/tab';
 import reducers from '../reducers';
 import messages from '../messages';
 import * as store from '../store';
@@ -60,6 +61,13 @@ const handleMessage = (message, sender) => {
   case messages.KEYDOWN:
     return backgroundStore.dispatch(
       inputActions.keyPress(message.code, message.ctrl), sender);
+  case messages.OPEN_URL:
+    if (message.newTab) {
+      return backgroundStore.dispatch(
+        tabActions.openNewTab(message.url), sender);
+    }
+    return backgroundStore.dispatch(
+      tabActions.openToTab(message.url, sender.tab), sender);
   case messages.CONSOLE_BLURRED:
     return backgroundStore.dispatch(
       consoleActions.hide(), sender);
diff --git a/src/content/index.js b/src/content/index.js
index fc79f6c..8848875 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -11,7 +11,11 @@ consoleFrames.initialize(window.document);
 const startFollows = (newTab) => {
   let follow = new Follow(window.document, newTab);
   follow.onActivated((element) => {
-    element.click();
+    browser.runtime.sendMessage({
+      type: messages.OPEN_URL,
+      url: element.href,
+      newTab
+    });
   });
 };
 
diff --git a/src/messages/index.js b/src/messages/index.js
index 3bdecca..4e34436 100644
--- a/src/messages/index.js
+++ b/src/messages/index.js
@@ -6,5 +6,7 @@ export default {
   CONSOLE_ENTERED: 'console.entered',
   CONSOLE_CHANGEED: 'console.changed',
 
-  KEYDOWN: 'keydown'
+  KEYDOWN: 'keydown',
+
+  OPEN_URL: 'open.url'
 };