diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css
index 77c6274..cd883e2 100644
--- a/src/wp-admin/css/nav-menus.css
+++ b/src/wp-admin/css/nav-menus.css
@@ -65,6 +65,10 @@ ul.add-menu-item-tabs li {
 	position: relative;
 }
 
+ul.nav-tab-wrapper > li {
+	margin-bottom: 0;
+}
+
 .blank-slate .menu-settings {
 	border: none;
 	margin-top: 0;
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index 7f19e86..566a153 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -626,19 +626,19 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 	<hr class="wp-header-end">
 
-	<h2 class="nav-tab-wrapper wp-clearfix">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+	<ul class="nav-tab-wrapper wp-clearfix">
+		<li><a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a></li>
 		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
+			<li><a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
 								<?php
 								if ( $locations_screen ) {
 									echo ' nav-tab-active';}
 ?>
-"><?php esc_html_e( 'Manage Locations' ); ?></a>
+"><?php esc_html_e( 'Manage Locations' ); ?></a></li>
 		<?php
 			endif;
 		?>
-	</h2>
+	</ul>
 	<?php
 	foreach ( $messages as $message ) :
 		echo $message . "\n";