diff --git a/src/selector.js b/src/selector.js
index 4177672eb..42e7e415e 100644
--- a/src/selector.js
+++ b/src/selector.js
@@ -6,7 +6,7 @@
  */
 (function(){
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,
 	done = 0,
 	toString = Object.prototype.toString;
 
diff --git a/test/index.html b/test/index.html
index c415d11c6..e0389ac84 100644
--- a/test/index.html
+++ b/test/index.html
@@ -50,6 +50,7 @@
 			<p id="sap">This link has <code><a href="#2" id="anchor2">class="blog"</a></code>: <a href="http://simon.incutio.com/" class="blog link" id="simon">Simon Willison's Weblog</a></p>
 
 		</div>
+		<span id="name+value"></span>
 		<p id="first">Try them out:</p>
 		<ul id="firstUL"></ul>
 		<ol id="empty"></ol>
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 419116e6d..341d59b9e 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -69,7 +69,7 @@ test("broken", function() {
 });
 
 test("id", function() {
-	expect(27);
+	expect(28);
 	t( "ID Selector", "#body", ["body"] );
 	t( "ID Selector w/ Element", "body#body", ["body"] );
 	t( "ID Selector w/ Element", "ul#first", [] );
@@ -105,6 +105,8 @@ test("id", function() {
 
 	t( "Underscore ID", "#types_all", ["types_all"] );
 	t( "Dash ID", "#fx-queue", ["fx-queue"] );
+
+	t( "ID with weird characters in it", "#name\\+value", ["name+value"] );
 });
 
 test("class", function() {