diff --git a/templates/header_location.phtml b/templates/header_location.phtml
index 957441727f..4f41a06960 100644
--- a/templates/header_location.phtml
+++ b/templates/header_location.phtml
@@ -7,7 +7,7 @@
     <meta http-equiv="Refresh" content="0;url=<?php echo htmlspecialchars($uri) ?>">
     <script type="text/javascript">
         //<![CDATA[
-        setTimeout("window.location = unescape('<?php echo PMA_escapeJsString($uri) ?>')", 2000);
+        setTimeout("window.location = decodeURI('<?php echo PMA_escapeJsString($uri) ?>')", 2000);
         //]]>
     </script>
 </head>
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 7eb69d98f4..57f2742d85 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -263,7 +263,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
             . "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">"
             . "<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\">"
             . "<script type=\"text/javascript\">//<![CDATA[
-        setTimeout(\"window.location = unescape('" . $testUri_js . "')\", 2000);
+        setTimeout(\"window.location = decodeURI('" . $testUri_js . "')\", 2000);
         //]]></script></head>
 <body><script type=\"text/javascript\">//<![CDATA[
     document.write('<p><a href=\"" . $testUri_html . "\">" . __('Go') . "</a></p>');
