diff --git a/class2.php b/class2.php
index 7c46f865c..213e0dd73 100644
--- a/class2.php
+++ b/class2.php
@@ -1130,7 +1130,7 @@ if(!defined("THEME_LAYOUT"))
 	    //e_SELF.(e_QUERY ? '?'.e_QUERY : '');
 		$c_url = str_replace(array('&'), array('&'), e_REQUEST_URL);//.(e_QUERY ? '?'.e_QUERY : '');// mod_rewrite support
 		// FIX - check against urldecoded strings
-		$c_url = rawurldecode($c_url);
+		$c_url = rtrim(rawurldecode($c_url), '?');
 		
     	foreach($cusPagePref as $lyout=>$cusPageArray)
 		{