Index: wp-admin/css/common.css
===================================================================
--- wp-admin/css/common.css	(revision 40650)
+++ wp-admin/css/common.css	(working copy)
@@ -1030,7 +1030,8 @@
 	margin: 0;
 }
 
-.filter-links li > a {
+.filter-links li > a,
+.filter-links li > button {
 	display: inline-block;
 	margin: 0 10px;
 	padding: 15px 0;
@@ -1039,6 +1040,14 @@
 	cursor: pointer;
 }
 
+.filter-links li > button {
+	background: none;
+	border-left: none;
+	border-right: none;
+	border-top: none;
+	padding-bottom: 16px;
+}
+
 .filter-links .current {
 	-webkit-box-shadow: none;
 	box-shadow: none;
@@ -1049,8 +1058,13 @@
 .filter-links li > a:hover,
 .filter-links li > a:focus,
 .show-filters .filter-links a.current:hover,
-.show-filters .filter-links a.current:focus {
+.show-filters .filter-links a.current:focus,
+.filter-links li > button:hover,
+.filter-links li > button:focus,
+.show-filters .filter-links button.current:hover,
+.show-filters .filter-links button.current:focus {
 	color: #00a0d2;
+	outline: none;
 }
 
 .wp-filter .search-form {
Index: wp-admin/js/theme.js
===================================================================
--- wp-admin/js/theme.js	(revision 40650)
+++ wp-admin/js/theme.js	(working copy)
@@ -1534,7 +1534,7 @@
 			request.tag = [ value.slice( 4 ) ];
 		}
 
-		$( '.filter-links li > a.current' ).removeClass( 'current' );
+		$( '.filter-links li > a.current, .filter-links li > button.current' ).removeClass( 'current' );
 		$( 'body' ).removeClass( 'show-filters filters-applied show-favorites-form' );
 		$( '.drawer-toggle' ).attr( 'aria-expanded', 'false' );
 
@@ -1554,6 +1554,7 @@
 	// Register events for sorting and filters in theme-navigation
 	events: {
 		'click .filter-links li > a': 'onSort',
+		'click .filter-links li > button': 'onSort',
 		'click .theme-filter': 'onFilter',
 		'click .drawer-toggle': 'moreFilters',
 		'click .filter-drawer .apply-filters': 'applyFilters',
@@ -1651,7 +1652,7 @@
 	sort: function( sort ) {
 		this.clearSearch();
 
-		$( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
+		$( '.filter-links li > a, .filter-links li > button, .theme-filter' ).removeClass( this.activeClass );
 		$( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
 
 		if ( 'favorites' === sort ) {
@@ -1674,7 +1675,7 @@
 			return;
 		}
 
-		$( '.filter-links li > a, .theme-section' ).removeClass( this.activeClass );
+		$( '.filter-links li > a, .filter-links li > button, .theme-section' ).removeClass( this.activeClass );
 		$el.addClass( this.activeClass );
 
 		if ( ! filter ) {
@@ -1713,7 +1714,7 @@
 		}
 
 		$( 'body' ).addClass( 'filters-applied' );
-		$( '.filter-links li > a.current' ).removeClass( 'current' );
+		$( '.filter-links li > a.current, .filter-links li > button.current' ).removeClass( 'current' );
 		filteringBy.empty();
 
 		_.each( tags, function( tag ) {
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 40650)
+++ wp-admin/theme-install.php	(working copy)
@@ -161,10 +161,10 @@
 		</div>
 
 		<ul class="filter-links">
-			<li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
+			<li><button type="button" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></button></li>
+			<li><button type="button" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></button></li>
+			<li><button type="button" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></button></li>
+			<li><button type="button" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></button></li>
 		</ul>
 
 		<button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e( 'Feature Filter' ); ?></button>