3 files changed, 10 insertions, 10 deletions
diff --git a/src/console/components/completion.js b/src/console/components/completion.js
index 5033b5c..a49a221 100644
--- a/src/console/components/completion.js
+++ b/src/console/components/completion.js
@@ -3,6 +3,10 @@ export default class Completion {
     this.wrapper = wrapper;
     this.store = store;
     this.prevState = {};
+
+    store.subscribe(() => {
+      this.update();
+    });
   }
 
   update() {
diff --git a/src/console/components/console.js b/src/console/components/console.js
index 8b69df9..5028e2a 100644
--- a/src/console/components/console.js
+++ b/src/console/components/console.js
@@ -16,6 +16,10 @@ export default class ConsoleComponent {
 
     this.hideCommand();
     this.hideMessage();
+
+    store.subscribe(() => {
+      this.update();
+    });
   }
 
   onBlur() {
diff --git a/src/console/index.js b/src/console/index.js
index 2ae5779..36473fe 100644
--- a/src/console/index.js
+++ b/src/console/index.js
@@ -7,14 +7,11 @@ import { createStore } from 'shared/store';
 import * as consoleActions from 'console/actions/console';
 
 const store = createStore(reducers);
-let completionComponent = null;
-let consoleComponent = null;
 
 window.addEventListener('load', () => {
   let wrapper = document.querySelector('#vimvixen-console-completion');
-  completionComponent = new CompletionComponent(wrapper, store);
-
-  consoleComponent = new ConsoleComponent(document.body, store);
+  new CompletionComponent(wrapper, store); // eslint-disable-line no-new
+  new ConsoleComponent(document.body, store); // eslint-disable-line no-new
 });
 
 const onMessage = (message) => {
@@ -30,11 +27,6 @@ const onMessage = (message) => {
   }
 };
 
-store.subscribe(() => {
-  completionComponent.update();
-  consoleComponent.update();
-});
-
 browser.runtime.onMessage.addListener(onMessage);
 window.addEventListener('message', (event) => {
   onMessage(JSON.parse(event.data));