diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 53b8d4d9b..d80cb99a6 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -3,7 +3,7 @@
 // On which page are we ?
 $PHP_SELF = $_SERVER['PHP_SELF'];
 if ( empty($PHP_SELF) )
-	$PHP_SELF = $_SERVER["REQUEST_URI"];
+	$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
 
 if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
 	$pagenow = $self_matches[1];