diff --git a/webclient/js/library.js b/webclient/js/library.js
index 1abf0e17..ed39ba69 100644
--- a/webclient/js/library.js
+++ b/webclient/js/library.js
@@ -18,7 +18,7 @@ function initSearch() {
 
     if ((value.length < 100) && (value.length > 0)) {
         showLoading(true);
-        //hide ios/android keyboard 
+        //hide ios/android keyboard
         document.activeElement.blur();
         $("input").blur();
 
@@ -27,10 +27,27 @@ function initSearch() {
         delete customTracklists['albumresultscache'];
         delete customTracklists['trackresultscache'];
         $("#searchresults").hide();
-        mopidy.library.search({
-            any: [value]
-        }).then(processSearchResults, console.error);
-//       console.log('search sent', value);
+
+        mopidy.getUriSchemes().then(function (schemes) {
+            var query = {},
+                uris = [];
+
+            var regexp = $.map(schemes, function (scheme) {
+                return '^' + scheme + ':';
+            }).join('|');
+
+            var match = value.match(regexp);
+            if (match) {
+                var scheme = match[0];
+                query = {uri: [value]};
+                uris = [scheme];
+            } else {
+                query = {any: [value]};
+            }
+
+            mopidy.library.search(query, uris).then(processSearchResults, console.error);
+            // console.log('search sent', value);
+        });
     }
 }