diff --git a/javascript/GridField.js b/javascript/GridField.js
index bbe020550..47663e17e 100644
--- a/javascript/GridField.js
+++ b/javascript/GridField.js
@@ -302,7 +302,7 @@
 							},
 							type: "GET",
 							url: suggestionUrl,
-							data: escape(searchField.attr('name'))+'='+escape(searchField.val()), 
+							data: encodeURIComponent(searchField.attr('name'))+'='+encodeURIComponent(searchField.val()), 
 							success: function(data) {
 								response( $.map(JSON.parse(data), function( name, id ) {
 									return { label: name, value: name, id: id };