diff --git a/wp-includes/js/media-editor.js b/wp-includes/js/media-editor.js
index 3e2a651eb4..7c96148527 100644
--- a/wp-includes/js/media-editor.js
+++ b/wp-includes/js/media-editor.js
@@ -259,6 +259,7 @@
 				icontag:    'dt',
 				captiontag: 'dd',
 				columns:    '3',
+				link:       'post',
 				size:       'thumbnail',
 				orderby:    'menu_order ID'
 			},
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 7e79efdaf4..d4840903de 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -347,12 +347,12 @@ function wp_print_media_templates() {
 					data-user-setting="urlbutton"
 				<# } #>>
 
-				<option value="file" selected>
-					<?php esc_attr_e('Media File'); ?>
-				</option>
-				<option value="post">
+				<option value="post" selected>
 					<?php esc_attr_e('Attachment Page'); ?>
 				</option>
+				<option value="file">
+					<?php esc_attr_e('Media File'); ?>
+				</option>
 			</select>
 		</label>