diff --git a/src/js/media/controllers/featured-image.js b/src/js/media/controllers/featured-image.js
index e08129fa2d..83c39f9936 100644
--- a/src/js/media/controllers/featured-image.js
+++ b/src/js/media/controllers/featured-image.js
@@ -87,7 +87,6 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 	 * @since 3.5.0
 	 */
 	activate: function() {
-		this.updateSelection();
 		this.frame.on( 'open', this.updateSelection, this );
 
 		Library.prototype.activate.apply( this, arguments );
@@ -107,6 +106,7 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 	 */
 	updateSelection: function() {
 		var selection = this.get('selection'),
+			library = this.get('library'),
 			id = wp.media.view.settings.post.featuredImageId,
 			attachment;
 
@@ -116,6 +116,10 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 		}
 
 		selection.reset( attachment ? [ attachment ] : [] );
+
+		if ( library.hasMore() ) {
+			library.more();
+		}
 	}
 });
 
diff --git a/src/js/media/controllers/replace-image.js b/src/js/media/controllers/replace-image.js
index eb6823a22b..d042ec3c07 100644
--- a/src/js/media/controllers/replace-image.js
+++ b/src/js/media/controllers/replace-image.js
@@ -99,9 +99,14 @@ ReplaceImage = Library.extend(/** @lends wp.media.controller.ReplaceImage.protot
 	 */
 	updateSelection: function() {
 		var selection = this.get('selection'),
+			library = this.get('library'),
 			attachment = this.image.attachment;
 
 		selection.reset( attachment ? [ attachment ] : [] );
+
+		if ( library.hasMore() ) {
+			library.more();
+		}
 	}
 });