diff --git a/README.md b/README.md
index 7653974..adad3f6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # vimch
 
-![v](https://img.shields.io/badge/version-0.0.4-green)
+![v](https://img.shields.io/badge/version-0.0.41-green)
 
 vimch - Vim Bindings for Chromium. This is a fork of [cVim](https://github.com/1995eaton/chromium-vim) (discontinued) and [vb4c](https://github.com/dcchambers/vb4c) (archived).
 
diff --git a/content_scripts/complete.js b/content_scripts/complete.js
index 0adf9c9..da18db9 100644
--- a/content_scripts/complete.js
+++ b/content_scripts/complete.js
@@ -52,16 +52,25 @@ var Complete = {
       return '';
 
     input[0] = this.getAlias(input[0]) || input[0];
+
+    const callDefaultEngine = (searchTerms) => {
+      const defaultEngine =
+            Complete.getEngine(settings.defaultengine) ??
+            Complete.getEngine('google');
+
+      return defaultEngine.requestUrl + encodeURIComponent(searchTerms.join(' '));
+    };
+
+    if (!this.engineEnabled(input[0]))
+      return callDefaultEngine(input);
+
     if (!this.hasEngine(input[0])) {
       if (!isLink && (isURL || Utils.isValidURL(input.join(' ')))) {
         input = input.join(' ');
         return (!/^[a-zA-Z\-]+:/.test(input) ? 'http://' : '') +
           input;
       }
-      var defaultEngine = this.getEngine(settings.defaultengine);
-      return (defaultEngine ? defaultEngine.requestUrl :
-                              this.getEngine('google').requestUrl) +
-        encodeURIComponent(input.join(' '));
+      return callDefaultEngine(input);
     }
 
     var engine = this.getEngine(input[0]);
@@ -134,7 +143,7 @@ var Complete = {
       this.activeEngines.push(name);
   },
   engineEnabled: function(name) {
-    return this.activeEngines.indexOf(name) !== -1;
+    return this.hasEngine(name) && this.activeEngines.indexOf(name) !== -1;
   }
 };
 
diff --git a/manifest.json b/manifest.json
index 2ce2b11..8c409ec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "vimch",
-  "version": "0.0.3",
+  "version": "0.0.41",
   "description": "vimch: Vim Bindings For Chromium. A fork of cVim.",
   "icons": {
     "128": "icons/128.png",