Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php	(revision 4708)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php	(working copy)
@@ -68,10 +68,15 @@
 	 */
 	public function get_topic_title( $title, $topic_id ) {
 		// Only run when enabled on a topic's forum.
-		if ( bbp_is_single_topic() || ! $this->is_enabled_on_forum( bbp_get_topic_forum_id( $topic_id ) ) ) {
+		if ( ! $this->is_enabled_on_forum( bbp_get_topic_forum_id( $topic_id ) ) ) {
 			return $title;
 		}
 
+		// Don't run when viewing a single topic or a topic edit page.
+		if ( bbp_is_single_topic() || bbp_is_topic_edit() ) {
+			return $title;
+		}
+
 		// Don't run when displaying a title attribute via bbp_get_reply_title_fallback(), hooked to 'the_title'
 		if ( doing_filter( 'the_title' ) ) {
 			return $title;