diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js
index c0d073a57d..c610106ed4 100644
--- a/wp-admin/js/media-upload.js
+++ b/wp-admin/js/media-upload.js
@@ -214,7 +214,6 @@ var tb_position;
 		return {
 			defaults: {
 				order:      'ASC',
-				orderby:    'post__in',
 				id:         wp.media.view.settings.postId,
 				itemtag:    'dl',
 				icontag:    'dt',
@@ -280,6 +279,12 @@ var tb_position;
 				if ( attrs.ids && 'post__in' === attrs.orderby )
 					delete attrs.orderby;
 
+				// Remove default attributes from the shortcode.
+				_.each( wp.media.gallery.defaults, function( value, key ) {
+					if ( value === attrs[ key ] )
+						delete attrs[ key ];
+				});
+
 				shortcode = new wp.shortcode({
 					tag:    'gallery',
 					attrs:  attrs,