diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
index 40ad09b808239..5e153f33f2a1c 100644
--- a/blocks/library/embed/index.js
+++ b/blocks/library/embed/index.js
@@ -7,6 +7,7 @@ import Placeholder from 'components/placeholder';
 /**
  * Internal dependencies
  */
+import './style.scss';
 import { registerBlock, query } from '../../api';
 import Editable from '../../editable';
 
@@ -40,7 +41,7 @@ registerBlock( 'core/embed', {
 		}
 
 		return (
-			<figure>
+			<figure className="blocks-embed">
 				<div className="iframe-overlay">
 					<iframe src={ url } title={ title } />
 				</div>
@@ -53,6 +54,7 @@ registerBlock( 'core/embed', {
 						onFocus={ setFocus }
 						onChange={ ( value ) => setAttributes( { caption: value } ) }
 						inline
+						inlineToolbar
 					/>
 				) : null }
 			</figure>
diff --git a/blocks/library/embed/style.scss b/blocks/library/embed/style.scss
new file mode 100644
index 0000000000000..af0897ec53ca8
--- /dev/null
+++ b/blocks/library/embed/style.scss
@@ -0,0 +1,18 @@
+.blocks-embed {
+	margin: 0;
+}
+
+.blocks-embed .iframe-overlay {
+	position: relative;
+	width: 100%;
+	height: 0;
+	padding-bottom: 56.25%; /* 16:9 */
+}
+
+.blocks-embed iframe {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
diff --git a/post-content.js b/post-content.js
index 30fb9c74d21ab..b5acb20997765 100644
--- a/post-content.js
+++ b/post-content.js
@@ -37,7 +37,7 @@ window._wpGutenbergPost = {
 			'<!-- /wp:core/text -->',
 
 			'<!-- wp:core/embed url="https://www.youtube.com/watch?v=Nl6U7UotA-M" -->',
-			'<figure><iframe width="560" height="315" src="//www.youtube.com/embed/Nl6U7UotA-M" frameborder="0" allowfullscreen></iframe><figcaption>State of the Word 2016</figcaption></figure>',
+			'<figure><iframe src="//www.youtube.com/embed/Nl6U7UotA-M" frameborder="0" allowfullscreen></iframe><figcaption>State of the Word 2016</figcaption></figure>',
 			'<!-- /wp:core/embed -->',
 
 			'<!-- wp:core/heading -->',