Index: src/includes/topics/functions.php
===================================================================
--- src/includes/topics/functions.php	(revision 6268)
+++ src/includes/topics/functions.php	(working copy)
@@ -2329,9 +2329,10 @@
 				case 'trash':
 					check_ajax_referer( "trash-{$nonce_suffix}" );
 
-					$retval['view_all'] = true;
-					$retval['status']   = wp_trash_post( $r['id'] );
-					$retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
+					$retval['view_all']    = true;
+					$retval['status']      = wp_trash_post( $r['id'] );
+					$retval['message']     = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
+					$retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] );
 
 					break;
 
@@ -2338,8 +2339,9 @@
 				case 'untrash':
 					check_ajax_referer( "untrash-{$nonce_suffix}" );
 
-					$retval['status']  = wp_untrash_post( $r['id'] );
-					$retval['message'] = __( '<strong>ERROR</strong>: There was a problem untrashing the topic.', 'bbpress' );
+					$retval['status']      = wp_untrash_post( $r['id'] );
+					$retval['message']     = __( '<strong>ERROR</strong>: There was a problem untrashing the topic.', 'bbpress' );
+					$retval['redirect_to'] = bbp_get_topic_permalink( $r['id'] );
 
 					break;
 
@@ -2346,8 +2348,9 @@
 				case 'delete':
 					check_ajax_referer( "delete-{$nonce_suffix}" );
 
-					$retval['status']  = wp_delete_post( $r['id'] );
-					$retval['message'] = __( '<strong>ERROR</strong>: There was a problem deleting the topic.', 'bbpress' );
+					$retval['status']      = wp_delete_post( $r['id'] );
+					$retval['message']     = __( '<strong>ERROR</strong>: There was a problem deleting the topic.', 'bbpress' );
+					$retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent );
 
 					break;
 			}
@@ -2355,11 +2358,6 @@
 			break;
 	}
 
-	// Maybe redirect back to the topic's forum
-	if ( isset( $r['sub_action'] ) && ( 'delete' === $r['sub_action'] ) ) {
-		$retval['redirect_to'] = bbp_get_forum_permalink( $retval['status']->post_parent );
-	}
-
 	// Add view all if needed
 	if ( ! empty( $retval['view_all'] ) ) {
 		$retval['redirect_to'] = bbp_add_view_all( $retval['redirect_to'], true );