diff --git wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php
index d49fdecd0..1215511c1 100644
--- wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php
+++ wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php
@@ -515,21 +515,41 @@ class Hooks {
 	 * Displays a link to the new topic form.
 	 */
 	public function new_topic_link() {
-		if ( bbp_is_single_forum() ) {
+		if (
+			bbp_is_single_forum()
+		||
+			bbp_is_single_view() && in_array( bbp_get_view_id(), array( 'plugin', 'reviews', 'theme' ) )
+		) {
+			$btn = null;
+			$is_forum = bbp_is_single_forum();
+			$is_reviews = 'reviews' === bbp_get_view_id();
+
 			if ( bbp_current_user_can_access_create_topic_form() ) {
-				printf(
-					'<a class="button create-topic" href="#new-topic-0">%s</a>',
-					__( 'Create Topic', 'wporg-forums' )
+				$btn = sprintf(
+					'<a class="button ' . ( $is_forum ? 'button-primary' : '' ) . ' create-topic" href="#new-topic-0">%s</a>',
+					$is_reviews ? __( 'Create Review', 'wporg-forums' ) : __( 'Create Topic', 'wporg-forums' )
 				);
 			} elseif ( ! bbp_is_forum_closed() && ! is_user_logged_in() ) {
-				printf(
-					'<a class="button create-topic login" href="%s">%s</a>',
+				$btn = sprintf(
+					'<a class="button ' . ( $is_forum ? 'button-primary' : '' ) . ' create-topic login" href="%s">%s</a>',
 					wp_login_url(),
-					__( 'Log in to Create a Topic', 'wporg-forums' )
+					$is_reviews ? __( 'Log in to Create a Review', 'wporg-forums' ) : __( 'Log in to Create a Topic', 'wporg-forums' )
 				);
 			}
 
-			remove_filter( 'bbp_template_before_pagination_loop', array( $this, 'new_topic_link' ) );
+			if ( $btn ) {
+				if ( $is_forum ) {
+					echo '<div class="bbp-create-topic-wrapper">';
+					require_once get_template_directory() . '/searchform.php';
+					printf( '<span>%s</span>', __( 'or', 'wporg-forums' ) );
+					echo $btn;
+					echo '</div>';
+				} else {
+					echo $btn;
+				}
+
+				remove_filter( 'bbp_template_before_pagination_loop', array( $this, 'new_topic_link' ) );
+			}
 		}
 	}
 
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
index 6d7aa0361..fe4bcc092 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
@@ -483,6 +483,45 @@ section {
 			}
 		}
 
+		.bbp-create-topic-wrapper {
+			padding: 15px 0 25px;
+			text-align: center;
+
+			.create-topic {
+				float: none;
+				height: auto;
+				padding: 9px 12px;
+
+				&::before {
+					color: #FFF;
+				}
+			}
+
+			> span {
+				margin: 0 8px 0 6px;
+				font-size: 0.8rem;
+			}
+
+			.search-form {
+				display: inline-block;
+				width: 50%;
+				margin-bottom: 0;
+			}
+
+			@media (max-width: 767px) {
+				.create-topic,
+				> span,
+				.search-form {
+					display: block;
+					width: 100%;
+				}
+
+				> span {
+					margin: 3px 0;
+				}
+			}
+		}
+
 		.bbp-pagination {
 			font-size: ms(-2);
 			float: none;