diff --git a/cli/src/tests/query_test.rs b/cli/src/tests/query_test.rs
index 2a492572..e1433c97 100644
--- a/cli/src/tests/query_test.rs
+++ b/cli/src/tests/query_test.rs
@@ -201,6 +201,36 @@ fn test_query_errors_on_invalid_symbols() {
     allocations::record(|| {
         let language = get_language("javascript");
 
+        assert_eq!(
+            Query::new(&language, "\">>>>\"").unwrap_err(),
+            QueryError {
+                row: 0,
+                offset: 1,
+                column: 1,
+                kind: QueryErrorKind::NodeType,
+                message: ">>>>".to_string()
+            }
+        );
+        assert_eq!(
+            Query::new(&language, "\"te\\\"st\"").unwrap_err(),
+            QueryError {
+                row: 0,
+                offset: 1,
+                column: 1,
+                kind: QueryErrorKind::NodeType,
+                message: "te\\\"st".to_string()
+            }
+        );
+        assert_eq!(
+            Query::new(&language, "\"\\\\\" @cap").unwrap_err(),
+            QueryError {
+                row: 0,
+                offset: 1,
+                column: 1,
+                kind: QueryErrorKind::NodeType,
+                message: "\\\\".to_string()
+            }
+        );
         assert_eq!(
             Query::new(&language, "(clas)").unwrap_err(),
             QueryError {
diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs
index 5c04c0a8..6950c63b 100644
--- a/lib/binding_rust/lib.rs
+++ b/lib/binding_rust/lib.rs
@@ -2353,27 +2353,24 @@ impl Query {
                 ffi::TSQueryErrorNodeType | ffi::TSQueryErrorField | ffi::TSQueryErrorCapture => {
                     let suffix = source.split_at(offset).1;
                     let in_quotes = source.as_bytes()[offset - 1] == b'"';
-                    let mut end_offset = suffix.len();
-                    if let Some(pos) = suffix
-                        .char_indices()
-                        .take_while(|(_, c)| *c != '\n')
-                        .find_map(|(i, c)| match c {
-                            '"' if in_quotes
-                                && i > 0
-                                && suffix.chars().nth(i - 1) != Some('\\') =>
-                            {
-                                Some(i)
+                    let mut backslashes = 0;
+                    let end_offset = suffix
+                        .find(|c| {
+                            if in_quotes {
+                                if c == '"' && backslashes % 2 == 0 {
+                                    true
+                                } else if c == '\\' {
+                                    backslashes += 1;
+                                    false
+                                } else {
+                                    backslashes = 0;
+                                    false
+                                }
+                            } else {
+                                !char::is_alphanumeric(c) && c != '_' && c != '-'
                             }
-                            c if !in_quotes
-                                && (c.is_whitespace() || c == '(' || c == ')' || c == ':') =>
-                            {
-                                Some(i)
-                            }
-                            _ => None,
                         })
-                    {
-                        end_offset = pos;
-                    }
+                        .unwrap_or(suffix.len());
                     message = suffix.split_at(end_offset).0.to_string();
                     kind = match error_type {
                         ffi::TSQueryErrorNodeType => QueryErrorKind::NodeType,