diff --git a/src/background.js b/src/background.js
index b9b8b5f..66bcdac 100644
--- a/src/background.js
+++ b/src/background.js
@@ -108,7 +108,7 @@ browser.runtime.onMessage.addListener(async ({ action, args }, { tab }) => {
   }
 
   if (action === 'getTopSites') {
-    if (browser.ghostery.getPref('app.update.channel') !== 'release') {
+    if (browser.ghostery.getPref('app.update.channel') === 'release') {
       return;
     }
     return (await browser.topSites.get({
@@ -117,11 +117,10 @@ browser.runtime.onMessage.addListener(async ({ action, args }, { tab }) => {
     })).filter(site => site.type === 'url');
   }
 
-  if (action === 'focusUrlbar') {
-    browser.ghostery.query(args[0]);
-  }
-
   if (action === 'getSearchEngines') {
+    if (browser.ghostery.getPref('app.update.channel') === 'release') {
+      return;
+    }
     return (await browser.search.get()).filter(
       engine => engine.name !== browser.runtime.getManifest()["chrome_settings_overrides"]["search_provider"].name
     );
diff --git a/src/content/focus-urlbar.js b/src/content/search-bar.js
similarity index 64%
rename from src/content/focus-urlbar.js
rename to src/content/search-bar.js
index daaabf9..e132582 100644
--- a/src/content/focus-urlbar.js
+++ b/src/content/search-bar.js
@@ -2,15 +2,15 @@
 
 (async function () {
   function observerSearchInput() {
-    const input$ = document.querySelector('#search-input');
-    input$.addEventListener('input', () => {
+    const form$ = document.querySelector('form');
+    form$.addEventListener('submit', () => {
+      const input$ = document.querySelector('#search-input');
       browser.runtime.sendMessage({
-        action: 'focusUrlbar',
-        args: [
-          input$.value,
-        ],
+        action: 'search',
+        args: [{
+          query: input$.value,
+        }],
       });
-      input$.value = '';
     });
   }
 
diff --git a/src/manifest.json b/src/manifest.json
index 78b1160..35ef0bf 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.14",
+  "version": "0.1.15",
   "browser_specific_settings": {
     "gecko": {
       "id": "search@ghostery.com"
@@ -19,7 +19,7 @@
       "https://*.ghosterysearch.com/",
       "http://localhost/*"
     ],
-    "js": ["content/login-cta.js", "content/top-sites.js", "content/focus-urlbar.js"]
+    "js": ["content/login-cta.js", "content/top-sites.js", "content/search-bar.js"]
   }, {
     "matches": [
       "https://*.ghosterysearch.com/search*",