diff --git a/wp-includes/js/shortcode.js b/wp-includes/js/shortcode.js
index d503e08172..9bc74ed289 100644
--- a/wp-includes/js/shortcode.js
+++ b/wp-includes/js/shortcode.js
@@ -98,7 +98,7 @@ window.wp = window.wp || {};
 		// 6. The closing tag.
 		// 7. An extra `]` to allow for escaping shortcodes with double `[[]]`
 		regexp: _.memoize( function( tag ) {
-			return new RegExp( '\\[(\\[?)(' + tag + ')\\b([^\\]\\/]*(?:\\/(?!\\])[^\\]\\/]*)*?)(?:(\\/)\\]|\\](?:([^\\[]*(?:\\[(?!\\/\\2\\])[^\\[]*)*)(\\[\\/\\2\\]))?)(\\]?)', 'g' );
+			return new RegExp( '\\[(\\[?)(' + tag + ')(?![\\w-])([^\\]\\/]*(?:\\/(?!\\])[^\\]\\/]*)*?)(?:(\\/)\\]|\\](?:([^\\[]*(?:\\[(?!\\/\\2\\])[^\\[]*)*)(\\[\\/\\2\\]))?)(\\]?)', 'g' );
 		}),