diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index 748805efe9..6ce8470a40 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -3900,10 +3900,11 @@
 				$value = $setting.find('[value="' + value + '"]');
 
 				if ( $value.length ) {
+					$setting.find('option').prop( 'selected', false );
 					$value.prop( '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() );
+					this.model.set( key, $setting.find(':selected').val() );
 				}