diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 49f512f9b5..67f4dc53b0 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -285,8 +285,7 @@
 			'click .trash-attachment':        'trashAttachment',
 			'click .edit-attachment':         'editAttachment',
 			'click .refresh-attachment':      'refreshAttachment',
-			'click .edit-image':              'handleEditImageClick',
-			'click .view-attachment':         'handleViewAttachmentClick'
+			'click .edit-image':              'handleEditImageClick'
 		},
 
 		initialize: function() {
@@ -329,13 +328,6 @@
 			this.controller.setState( 'edit-image' );
 		},
 
-		/**
-		 * When View is clicked, navigate to the attachment page
-		 */
-		handleViewAttachmentClick: function() {
-			window.location = this.model.get( 'link' );
-		},
-
 		afterDelete: function( model ) {
 			if ( ! model.destroyed ) {
 				return;
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 692c0edac2..8695d3813f 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -297,8 +297,6 @@ function wp_print_media_templates() {
 						<a class="button edit-image" href="#"><?php _e( 'Edit Image' ); ?></a>
 					<# } #>
 
-					<a class="button view-attachment" href="#"><?php _e( 'View' ); ?></a>
-
 					<# if ( ! data.uploading && data.can.remove ) { #>
 						<?php if ( MEDIA_TRASH ): ?>
 							<a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
@@ -393,6 +391,7 @@ function wp_print_media_templates() {
 				<# } #>
 			</div>
 
+			<a class="view-attachment" href="{{ data.link }}"><?php _e( 'View attachment page' ); ?></a> |
 			<a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
 
 		</div>