Index: wp-includes/class-wp-admin-bar.php
===================================================================
--- wp-includes/class-wp-admin-bar.php	(revision 32646)
+++ wp-includes/class-wp-admin-bar.php	(working copy)
@@ -503,19 +503,26 @@
 				endif;
 				?>><?php
 			else:
-				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( $node->id == 'search' ):
+					?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+					if ( ! empty( $node->meta['title'] ) ) :
+						?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+					endif;
+					?>><?php				
+				else:
+					?><a href="#wp-admin-bar-<?php esc_attr_e( $node->id ); ?>" class="ab-item ab-empty-item" <?php echo $aria_attributes;
+					if ( ! empty( $node->meta['title'] ) ) :
+						?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+					endif;
+					?>><?php
 				endif;
-				?>><?php
 			endif;
 
 			echo $node->title;
-
-			if ( $has_link ) :
+			if ( $node->id == 'search' ):
+				?></div><?php
+			else:
 				?></a><?php
-			else:
-				?></div><?php
 			endif;
 
 			if ( $is_parent ) :