diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index 704005af4e..372096da1e 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -3745,7 +3745,7 @@
 		update: function( key ) {
 			var value = this.model.get( key ),
 				$setting = this.$('[data-setting="' + key + '"]'),
-				$buttons;
+				$buttons, $value;
 
 			// Bail if we didn't find a matching setting.
 			if ( ! $setting.length )
@@ -3756,7 +3756,15 @@
 
 			// Handle dropdowns.
 			if ( $setting.is('select') ) {
-				$setting.find('[value="' + value + '"]').attr( 'selected', true );
+				$value = $setting.find('[value="' + value + '"]');
+
+				if ( $value.length ) {
+					$value.attr( 'selected', true );
+				} else {
+					// If we can't find the desired value, record what *is* selected.
+					this.model.set( $setting.data('setting'), $setting.find('[selected]').val() );
+				}
+
 
 			// Handle button groups.
 			} else if ( $setting.hasClass('button-group') ) {
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 7bd8ad2349..f4a9807786 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1825,10 +1825,10 @@ function wp_print_media_templates() {
 						<#
 						var size = data.sizes['<?php echo esc_js( $value ); ?>'];
 						if ( size ) { #>
-							<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
+							<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'full' ); ?>>
 								<?php echo esc_html( $name ); ?> &ndash; {{ size.width }} &times; {{ size.height }}
 							</option>
-						<# } #>>
+						<# } #>
 					<?php endforeach; ?>
 				</select>
 			</label>