Index: wp-content/themes/pub/wporg-forums/page-homepage.php
===================================================================
--- wp-content/themes/pub/wporg-forums/page-homepage.php	(revision 2056)
+++ wp-content/themes/pub/wporg-forums/page-homepage.php	(working copy)
@@ -31,11 +31,7 @@
 			</ul>
 			<h3><?php _e( 'Search the Support Forums', 'wporg-forums' ); ?></h3>
 			<p><?php _e( 'Enter a few words that describe the problem you&rsquo;re having.', 'wporg-forums' ); ?></p>
-			<form id="forumsearch" method="get" action="<?php bbp_search_url(); ?>">
-				<input name="search" class="text" id="forumsearchbox" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" type="text">
-				<input id="go" name="go" class="button" value="<?php esc_attr_e( 'Search', 'wporg-forums' ); ?>" type="submit">
-				<input value="1" name="forums" type="hidden">
-			</form>
+			<?php bbp_get_template_part( 'form', 'search' ); ?>
 			<h3><?php _e( 'Hot Topics', 'wporg-forums' ); ?></h3>
 			<p class="frontpageheatmap">
 				<?php wp_tag_cloud( array( 'smallest' => 14, 'largest' => 24, 'number' => 22, 'taxonomy' => bbp_get_topic_tag_tax_id() ) ); ?>
Index: wp-content/themes/pub/wporg-forums/style.css
===================================================================
--- wp-content/themes/pub/wporg-forums/style.css	(revision 2056)
+++ wp-content/themes/pub/wporg-forums/style.css	(working copy)
@@ -198,7 +198,11 @@
 }
 
 /* Search forms */
-#bbp_search,
+#bbp-search-form {
+	position: relative;
+	margin-top: 0;
+}
+
 .sidebar #ts,
 .sidebar #rs {
 	width: 90%;