diff --git a/beetsplug/web/static/beets.js b/beetsplug/web/static/beets.js
index eedec8a5f..757f2cdab 100644
--- a/beetsplug/web/static/beets.js
+++ b/beetsplug/web/static/beets.js
@@ -229,7 +229,7 @@ var AppView = Backbone.View.extend({
     },
     querySubmit: function(ev) {
         ev.preventDefault();
-        router.navigate('item/query/' + escape($('#query').val()), true);
+        router.navigate('item/query/' + encodeURIComponent($('#query').val()), true);
     },
     initialize: function() {
         this.playingItem = null;