diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index e2d61a8..91f0e1f 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -1175,7 +1175,10 @@ <script type="text/html" id="tmpl-gallery-settings">
 		<label class="setting">
 			<span><?php _e( 'Columns' ); ?></span>
 			<select data-setting="columns">
-				<?php for ( $i = 1; $i <= 9; $i++ ) : ?>
-					<option value="<?php echo esc_attr( $i ); ?>" <# if ( columns == <?php echo $i; ?> ) { #>selected<# } #>><?php echo esc_html( $i ); ?></option>
-				<?php endfor; ?>
+				<option value="0" <# if ( columns == 0 ) { #>selected<# } #>><?php esc_html_e( 'None (0)' ); ?></option>
+				<?php for ( $i = 1; $i <= 20; $i++ ) : ?>
+					<option value="<?php echo esc_attr( $i ); ?>" <# if ( columns == <?php echo $i; ?> ) { #>selected<# } #>>
+						<?php echo esc_html( $i ); ?>
+					</option>
+				<?php endfor; ?>
 			</select>
 		</label>
diff --git a/src/wp-admin/js/gallery.js b/src/wp-admin/js/gallery.js
index a7c6ef3..c9b1f25 100644
--- a/src/wp-admin/js/gallery.js
+++ b/src/wp-admin/js/gallery.js
@@ -57,7 +57,12 @@ wp.media.galleryDefaults = {
 	link: 'none',
 	orderby: 'menu_order ID',
 	order: 'ASC',
-	columns: 3
+	columns: 3
 };
+
+// Extend validate to allow 0 columns
+wp.media.gallery.validate = function( settings ) {
+	if ( typeof settings.columns !== 'undefined' && settings.columns < 0 ) {
+		settings.columns = 0;
+	}
+	return settings;
+};
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index bcc98f2..d80e3f3 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -1970,7 +1970,13 @@ function gallery_shortcode( $attr ) {
 	$columns = intval( $columns );
-	if ( $columns < 1 )
-		$columns = 3;
+	if ( $columns < 0 ) {
+		$columns = 0;
+	}
+
+	// Allow 0 or any positive integer.
+	if ( $columns === 0 || $columns >= 1 ) {
+		$selector = "gallery-{$instance}";
+	} else {
+		$columns = 3;
+	}
