diff --git src/wp-includes/formatting.php src/wp-includes/formatting.php
index 44376e5..b1f997f 100644
--- src/wp-includes/formatting.php
+++ src/wp-includes/formatting.php
@@ -486,7 +486,16 @@ function shortcode_unautop( $pee ) {
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	/**
+	 * Filter the list of shortcodes to run through the 'unautop' routine.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param array $shortcode_tags Shortcode tags to run through the 'unautop' routine.
+	 */
+	$unautop_shortcode_tags = apply_filters( 'unautop_shortcodes', array_keys( $shortcode_tags ) );
+
+	$tagregexp = join( '|', array_map( 'preg_quote', $unautop_shortcode_tags ) );
 	$spaces = wp_spaces_regexp();
 
 	$pattern =