Ticket #23110: 23110.patch

src/wp-includes/class-wp-editor.php

@@ -515 +515 @@
                                         'wpeditimage_disable_captions' => $no_captions,
                                         'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
                                         'plugins' => implode( ',', $plugins ),
+                                        'end_container_on_empty_block' => true
                                 );
 
                                 if ( ! empty( $mce_external_plugins ) ) {