Index: src/wp-includes/js/media-views.js
===================================================================
--- src/wp-includes/js/media-views.js	(revision 28015)
+++ src/wp-includes/js/media-views.js	(working copy)
@@ -778,6 +778,9 @@
 	 */
 	media.controller.CollectionEdit = media.controller.Library.extend({
 		defaults: {
+			type:         'image',
+			collectionType: 'gallery',
+			title:        l10n.editGalleryTitle,
 			multiple:     false,
 			describe:     true,
 			edge:         199,
@@ -804,6 +807,10 @@
 			this.set( 'id', collectionType + '-edit' );
 			this.set( 'toolbar', collectionType + '-edit' );
 
+			if ( ! this.get( 'SettingsView' ) ) {
+				this.set( 'SettingsView', media.view.Settings.Gallery );
+			}
+
 			// If we haven't been provided a `library`, create a `Selection`.
 			if ( ! this.get('library') ) {
 				this.set( 'library', new media.model.Selection() );
@@ -824,7 +831,7 @@
 			// Watch for uploaded attachments.
 			this.get('library').observe( wp.Uploader.queue );
 
-			this.frame.on( 'content:render:browse', this.renderSettings, this );
+			this.frame.on( 'content:render:browse', this.gallerySettings, this );
 
 			media.controller.Library.prototype.activate.apply( this, arguments );
 		},
@@ -833,12 +840,12 @@
 			// Stop watching for uploaded attachments.
 			this.get('library').unobserve( wp.Uploader.queue );
 
-			this.frame.off( 'content:render:browse', this.renderSettings, this );
+			this.frame.off( 'content:render:browse', this.gallerySettings, this );
 
 			media.controller.Library.prototype.deactivate.apply( this, arguments );
 		},
 
-		renderSettings: function( browser ) {
+		gallerySettings: function( browser ) {
 			var library = this.get('library'),
 				collectionType = this.get('collectionType'),
 				dragInfoText = this.get('dragInfoText'),
@@ -877,6 +884,8 @@
 		}
 	});
 
+	media.controller.GalleryEdit = media.controller.CollectionEdit;
+
 	/**
 	 * wp.media.controller.CollectionAdd
 	 *
@@ -887,6 +896,9 @@
 	 */
 	media.controller.CollectionAdd = media.controller.Library.extend({
 		defaults: _.defaults( {
+			type:         'image',
+			collectionType: 'gallery',
+			title:          l10n.addToGalleryTitle,
 			filterable:    'uploaded',
 			multiple:      'add',
 			priority:      100,
@@ -937,6 +949,8 @@
 		}
 	});
 
+	media.controller.GalleryAdd = media.controller.CollectionAdd;
+
 	/**
 	 * wp.media.controller.FeaturedImage
 	 *
@@ -1958,21 +1972,13 @@
 				new media.controller.EditImage( { model: options.editImage } ),
 
 				// Gallery states.
-				new media.controller.CollectionEdit({
-					type:           'image',
-					collectionType: 'gallery',
-					title:           l10n.editGalleryTitle,
-					SettingsView:    media.view.Settings.Gallery,
+				new media.controller.GalleryEdit({
 					library:         options.selection,
 					editing:         options.editing,
 					menu:           'gallery'
 				}),
 
-				new media.controller.CollectionAdd({
-					type:           'image',
-					collectionType: 'gallery',
-					title:          l10n.addToGalleryTitle
-				}),
+				new media.controller.GalleryAdd(),
 
 				new media.controller.Library({
 					id:         'playlist',