diff --git a/extension.js b/extension.js
index 0c82dac..bba1b11 100644
--- a/extension.js
+++ b/extension.js
@@ -74,11 +74,14 @@ const ConnectionManager = new Lang.Class({
         this._searchProvider = new Search.SshSearchProvider('CONNECTION MANAGER');
 
         if( typeof Main.overview.viewSelector === "object" &&
-            typeof Main.overview.viewSelector._searchResults === "object" &&
-            typeof Main.overview.viewSelector._searchResults._searchSystem === "object" &&
-            typeof Main.overview.viewSelector._searchResults._searchSystem.addProvider === "function") {
+            typeof Main.overview.viewSelector._searchResults === "object") {
+            if(typeof Main.overview.viewSelector._searchResults._registerProvider === "function") { //3.14
+                Main.overview.viewSelector._searchResults._registerProvider(this._searchProvider);
+            } else if(typeof Main.overview.viewSelector._searchResults._searchSystem === "object" &&
+                      typeof Main.overview.viewSelector._searchResults._searchSystem.addProvider === "function") { //3.12
                 Main.overview.viewSelector._searchResults._searchSystem.addProvider(this._searchProvider);
-        }    
+            }
+        }
 
         this._readConf();
     },
@@ -328,6 +331,11 @@ function enable() {
 }
 
 function disable() {
+    if(cm._searchProvider!=null) {
+        Main.overview.removeSearchProvider(cm._searchProvider);
+        cm._searchProvider = null;
+    }
+
     cm.monitor.cancel();
     cm.destroy();
 }
diff --git a/metadata.json b/metadata.json
index 022d7ce..f5b3372 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
-    "shell-version": ["3.12"],
-    "version": "0.8.3",
+    "shell-version": ["3.12", "3.14", "3.16", "3.18"],
+    "version": "0.8.5",
     "uuid": "connectionmanager2@ciancio.net",
     "name": "Connection Manager",
     "description": "Simple GUI app for Gnome 3 that provides a menu for initiating SSH/Telnet/Custom Apps connections.",