diff --git a/src/wp-includes/js/media-audiovideo.js b/src/wp-includes/js/media-audiovideo.js
index c78406f41b..0249851099 100644
--- a/src/wp-includes/js/media-audiovideo.js
+++ b/src/wp-includes/js/media-audiovideo.js
@@ -1408,8 +1408,9 @@
 	function init() {
 		$(document.body)
 			.on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers )
-			.on( 'click', '.add-media-source', function() {
-				media.frame.setState('add-' + media.frame.defaults.id + '-source');
+			.on( 'click', '.add-media-source', function( e ) {
+				media.frame.lastMime = $( e.currentTarget ).data( 'mime' );
+				media.frame.setState( 'add-' + media.frame.defaults.id + '-source' );
 			} );
 	}
 
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index aff81b7e4c..be0ee8fd3f 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -1140,9 +1140,18 @@
 
 		initialize: function( options ) {
 			this.media = options.media;
-			this.set( 'library', media.query({ type: options.type }) );
+			this.type = options.type;
+			this.set( 'library', media.query({ type: this.type }) );
 
 			media.controller.Library.prototype.initialize.apply( this, arguments );
+		},
+
+		activate: function() {
+			if ( media.frame.lastMime ) {
+				this.set( 'library', media.query({ type: media.frame.lastMime }) );
+				delete media.frame.lastMime;
+			}
+			media.controller.Library.prototype.activate.apply( this, arguments );
 		}
 	});
 
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index cadc3e9241..01d44ba2f2 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -771,7 +771,10 @@ function wp_print_media_templates() {
 	</script>
 
 	<script type="text/html" id="tmpl-audio-details">
-		<# var ext, html5types = { mp3: true, ogg: true }; #>
+		<# var ext, html5types = {
+			mp3: wp.media.view.settings.embedMimes.mp3,
+			ogg: wp.media.view.settings.embedMimes.ogg
+		}; #>
 
 		<?php $audio_types = wp_get_audio_extensions(); ?>
 		<div class="media-embed media-embed-details">
@@ -810,8 +813,8 @@ function wp_print_media_templates() {
 				<div class="setting">
 					<span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
 					<div class="button-large">
-					<# _.each( html5types, function (value, type) { #>
-					<button class="button add-media-source">{{ type }}</button>
+					<# _.each( html5types, function (mime, type) { #>
+					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
 					<# } ) #>
 					</div>
 				</div>
@@ -847,7 +850,11 @@ function wp_print_media_templates() {
 	</script>
 
 	<script type="text/html" id="tmpl-video-details">
-		<# var ext, html5types = { mp4: true, ogv: true, webm: true }; #>
+		<# var ext, html5types = {
+			mp4: wp.media.view.settings.embedMimes.mp4,
+			ogv: wp.media.view.settings.embedMimes.ogv,
+			webm: wp.media.view.settings.embedMimes.webm
+		}; #>
 
 		<?php $video_types = wp_get_video_extensions(); ?>
 		<div class="media-embed media-embed-details">
@@ -896,8 +903,8 @@ function wp_print_media_templates() {
 				<div class="setting">
 					<span>{{{ wp.media.view.l10n.mediaHTML5Text }}}</span>
 					<div class="button-large">
-					<# _.each( html5types, function (value, type) { #>
-					<button class="button add-media-source">{{ type }}</button>
+					<# _.each( html5types, function (mime, type) { #>
+					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
 					<# } ) #>
 					</div>
 				</div>