diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 5ac0e268eb..d59dc25808 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5718,7 +5718,8 @@
 				priority: 50
 			};
 
-			if ( media.view.settings.mediaTrash ) {
+			if ( media.view.settings.mediaTrash
+				&& this.controller.activeModes.where( { id: 'grid' } ).length ) {
 				filters.trash = {
 					text:  l10n.trash,
 					props: {
@@ -6499,7 +6500,8 @@
 			var library = this.controller.library;
 			event.preventDefault();
 
-			if ( media.view.settings.mediaTrash ) {
+			if ( media.view.settings.mediaTrash
+				&& 'edit-metadata' === this.controller.content.mode() ) {
 				this.model.set( 'status', 'trash' );
 				this.model.save().done( function() {
 					library._requery( true );
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index dee10bb02f..672f1db60d 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -508,7 +508,11 @@ function wp_print_media_templates() {
 
 				<# if ( ! data.uploading && data.can.remove ) { #>
 					<?php if ( MEDIA_TRASH ): ?>
+					<# if ( 'trash' === data.status ) { #>
+						<a class="untrash-attachment" href="#"><?php _e( 'Untrash' ); ?></a>
+					<# } else { #>
 						<a class="trash-attachment" href="#"><?php _e( 'Trash' ); ?></a>
+					<# } #>
 					<?php else: ?>
 						<a class="delete-attachment" href="#"><?php _e( 'Delete Permanently' ); ?></a>
 					<?php endif; ?>