diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 47cb57a9b2..fc850460f2 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -165,8 +165,11 @@ function has_shortcode( $content, $tag ) {
 			return false;
 
 		foreach ( $matches as $shortcode ) {
-			if ( $tag === $shortcode[2] )
+			if ( $tag === $shortcode[2] ) {
 				return true;
+			} elseif ( isset( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+				return has_shortcode( $shortcode[5], $tag );
+			}
 		}
 	}
 	return false;