diff --git a/src/wp-includes/js/media-editor.js b/src/wp-includes/js/media-editor.js
index f7253b7969..b65a499b19 100644
--- a/src/wp-includes/js/media-editor.js
+++ b/src/wp-includes/js/media-editor.js
@@ -189,6 +189,10 @@
 			shortcode = {};
 
 			if ( 'video' === type ) {
+				if ( attachment.image ) {
+					shortcode.poster = attachment.image.src;
+				}
+
 				if ( attachment.width ) {
 					shortcode.width = attachment.width;
 				}
diff --git a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index fba7b06dac..99b976881c 100644
--- a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -295,6 +295,7 @@ audio {
 	border-color: rgba(0,0,0,0.3);
 }
 
+.wpview-type-video .track-details,
 .wpview-type-audio .track-details {
 	position: absolute;
 	top: 0;