diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
index 2d2e587fdd..9e448b782a 100644
--- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -397,11 +397,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 	}
 
 	editor.on( 'init', function() {
-		var dom = editor.dom;
+		var dom = editor.dom,
+			captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';
 
-		if ( editor.getParam( 'wpeditimage_html5_captions' ) ) {
-			dom.addClass( editor.getBody(), 'html5-captions' );
-		}
+		dom.addClass( editor.getBody(), captionClass );
 
 		// Add caption field to the default image dialog
 		editor.on( 'wpLoadImageForm', function( event ) {
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index b7cfc2135e..66921e43b8 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -18,7 +18,7 @@ $wp_db_version = 26691;
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '4020-20140319a';
+$tinymce_version = '4020-20140326';
 
 /**
  * Holds the required PHP version