diff --git a/src/Shortcode.js b/src/Shortcode.js
index 7bab823..7cb675b 100644
--- a/src/Shortcode.js
+++ b/src/Shortcode.js
@@ -165,7 +165,7 @@ Shortcode.prototype.parseOptions = function(stringOptions) {
 };
 
 Shortcode.prototype.escapeTagRegExp = function(regex) {
-  return regex.replace(/[\[\]\/]/g, '\\$&');
+  return regex.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
 };
 
 Shortcode.prototype.template = function(s, d) {