diff --git a/ChangeLog b/ChangeLog
index 47544c7510..7ffee074cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
 - bug       Invalid value for CURLOPT_SSL_VERIFYPEER
 - bug #4367 Import status infinite loop
 - bug #4902 Designer: Loading does not work
+- bug #4904 Setup: Overview > Display does not work
 
 4.4.6.1 (2015-05-13)
 - bug #4899 [security] CSRF vulnerability in setup
diff --git a/setup/config.php b/setup/config.php
index ffe65915ed..aa7fea33cf 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -32,7 +32,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     $GLOBALS['ConfigFile']->resetConfigData();
     // drop post data
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php');
+    header('Location: index.php' . PMA_URL_getCommon());
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_download'], '')) {
     //
@@ -50,7 +50,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
         ConfigGenerator::getConfigFile($GLOBALS['ConfigFile'])
     );
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php?action_done=config_saved');
+    header('Location: index.php' . PMA_URL_getCommon() . '&action_done=config_saved');
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_load'], '')) {
     //
@@ -60,7 +60,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     include_once $config_file_path;
     $GLOBALS['ConfigFile']->setConfigData($cfg);
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php');
+    header('Location: index.php' . PMA_URL_getCommon());
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_delete'], '')) {
     //
@@ -68,14 +68,14 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     //
     @unlink($config_file_path);
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php');
+    header('Location: index.php' . PMA_URL_getCommon());
     exit;
 } else {
     //
     // Show generated config file in a <textarea>
     //
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php?page=config');
+    header('Location: index.php' . PMA_URL_getCommon() . '&page=config');
     exit;
 }
 ?>
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 859a784816..ea1f45ee0c 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -31,7 +31,7 @@ if ($mode == 'edit' && $server_exists) {
         . ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
 } elseif ($mode == 'remove' && $server_exists) {
     $cf->removeServer($id);
-    header('Location: index.php');
+    header('Location: index.php' . PMA_URL_getCommon());
     exit;
 } elseif ($mode == 'revert' && $server_exists) {
     // handled by process_formset()
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 5a65588021..1e4a503f7c 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -72,7 +72,7 @@ function PMA_generateHeader303()
 {
     // drop post data
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php');
+    header('Location: index.php' . PMA_URL_getCommon());
 
     if (!defined('TESTSUITE')) {
         exit;