diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 25b320e564..8624b85043 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -441,12 +441,19 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			if ( is_customize_preview() ) {
 				$_root_relative_current = strtok( untrailingslashit( $_SERVER['REQUEST_URI'] ), '?' );
 			}
+
 			$current_url        = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
 			$raw_item_url       = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
 			$item_url           = set_url_scheme( untrailingslashit( $raw_item_url ) );
 			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
-			if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+			$matches = array(
+				$current_url,            urldecode( $current_url ),
+				$_indexless_current,     urldecode( $_indexless_current ),
+				$_root_relative_current, urldecode( $_root_relative_current ),
+			);
+
+			if ( $raw_item_url && in_array( $item_url, $matches ) ) {
 				$classes[]                   = 'current-menu-item';
 				$menu_items[ $key ]->current = true;
 				$_anc_id                     = (int) $menu_item->db_id;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d279063d66..57f9dbc6d9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42731';
+$wp_version = '5.0-alpha-42732';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.