diff --git a/db_qbe.php b/db_qbe.php
index 95e72d894..29b32f467 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -180,12 +180,8 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
 ?>
 <div id="visual_builder_anchor" class="notice hide">
 	<span id="footnote_1">
-<?php echo __('Switch to'); ?>
-	<form action="<?php echo $tab_designer['link'] ?>" method="post">
-		<input type="submit"  style="background-color:#FFD; border-width:0; color:#00F;
-    	font-size: 15px;cursor: pointer" name="query" onmouseover="this.style.color='#F00';"
-            value="<?php echo __('visual builder'); ?>" onmouseout="this.style.color='#00F'"/></span>
-	</form>
+<?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?>
+    </span>
 </div>
 <?php
     }
diff --git a/pmd_general.php b/pmd_general.php
index 4363258bf..6da6b2e7a 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -27,6 +27,13 @@ $hidden           = "hidden";
     <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" />
     <title>Designer</title>
+<?php
+$params = array('lang' => $GLOBALS['lang']);
+if (isset($GLOBALS['db'])) {
+    $params['db'] = $GLOBALS['db'];
+}
+require_once './libraries/header_scripts.inc.php';
+?>
     <script type="text/javascript">
     // <![CDATA[
 <?php
@@ -48,14 +55,6 @@ echo '
 ?>
     // ]]>
     </script>
-<?php
-$params = array('lang' => $GLOBALS['lang']);
-if (isset($GLOBALS['db'])) {
-    $params['db'] = $GLOBALS['db'];
-}
-require_once './libraries/header_scripts.inc.php';
-?>
-    <script src="js/messages.php<?php echo PMA_generate_common_url($params); ?>" type="text/javascript"></script>
     <script src="pmd/scripts/ajax.js" type="text/javascript"></script>
     <script src="pmd/scripts/history.js" type="text/javascript"></script>
 	<script src="pmd/scripts/move.js" type="text/javascript"></script>