diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 08547ce1b5a5b..21adc09da0c62 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -557,7 +557,10 @@ function wp_print_media_templates() {
<# if ( data.link ) { #>
-
+
+
<# } #>
<# if ( data.can.save ) { #>
<# if ( data.link ) { #>
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 197653feda65a..8a3bc56656163 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -77,7 +77,7 @@ function create_initial_post_types() {
'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
'add_new' => __( 'Add New Media File' ),
'edit_item' => __( 'Edit Media' ),
- 'view_item' => __( 'View Attachment Page' ),
+ 'view_item' => ( '1' === get_option( 'wp_attachment_pages_enabled' ) ) ? __( 'View Attachment Page' ) : __( 'View Media File' ),
'attributes' => __( 'Attachment Attributes' ),
),
'public' => true,