diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 931eb4305b..223780fcd5 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -58,7 +58,7 @@ class WP {
 			// front.  For path info requests, this leaves us with the requesting
 			// filename, if any.  For 404 requests, this leaves us with the
 			// requested permalink.
-			$req_uri = str_replace($pathinfo, '', $req_uri);
+			$req_uri = str_replace($pathinfo, '', urldecode($req_uri));
 			$req_uri = trim($req_uri, '/');
 			$req_uri = preg_replace("|^$home_path|", '', $req_uri);
 			$req_uri = trim($req_uri, '/');