diff --git a/db_qbe.php b/db_qbe.php
index 2c80f6103c..c72602e2cd 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -175,7 +175,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
 }
 
 ?>
-
+<fieldset>
 <form action="db_qbe.php" method="post">
 <table class="data" style="width: 100%;">
 <tr class="odd noclick">
@@ -586,6 +586,7 @@ $url_params['col_cnt']  = $z;
 $url_params['rows']     = $w;
 echo PMA_generate_common_hidden_inputs($url_params);
 ?>
+</fieldset>
 <fieldset class="tblFooters">
 <table border="0" cellpadding="2" cellspacing="1">
 <tr>
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 8a7a8135b4..5ca7f91ee1 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -155,6 +155,8 @@ button {
 fieldset.tblFooters {
     margin-top:         0;
     margin-bottom:      0.5em;
+    /* avoid a thick line since this should be used under another fieldset */
+    border-top:         0;
     text-align:         <?php echo $right; ?>;
     float:              none;
     clear:              both;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 6eaf056227..bac71b84bc 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -138,6 +138,8 @@ button {
 fieldset.tblFooters {
     margin-top:         0;
     margin-bottom:      0.5em;
+    /* avoid a thick line since this should be used under another fieldset */
+    border-top:         0;
     text-align:         <?php echo $right; ?>;
     float:              none;
     clear:              both;