diff --git a/ChangeLog b/ChangeLog
index d5ff82f11d..7f886103c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
 - bug #3895 [browse] Fixed getting BLOB data
 - bug #3905 [export] Custom Exporting exports all databases
 - bug #3909 [import] Import of CSV FIle to selected table doesn't work
+- bug #3904 Browsing an empty table should not display its Structure
 
 4.0.0.0 (2013-05-03)
 + Patch #3481047 for rfe #3480477 Insert as new row enhancement
diff --git a/po/es.po b/po/es.po
index e702d48912..d96b6f7eb7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12545,7 +12545,11 @@ msgstr "Nombre del archivo"
 
 #: tbl_indexes.php:71
 msgid "The name of the primary key must be \"PRIMARY\"!"
+<<<<<<< HEAD
 msgstr "¡El nombre de la clave primaria debe ser «PRIMARY»!"
+=======
+msgstr "El nombre de la clave primaria debe ser «PRIMARY»!"
+>>>>>>> QA_4_0
 
 #: tbl_indexes.php:81
 msgid "Can't rename index to PRIMARY!"
@@ -12553,7 +12557,34 @@ msgstr "No se puede cambiar el nombre del índice a PRIMARY!"
 
 #: tbl_indexes.php:97
 msgid "No index parts defined!"
+<<<<<<< HEAD
 msgstr "¡No se han definido las partes del índice!"
+=======
+msgstr "No se han definido las partes del índice!"
+
+#: tbl_indexes.php:197
+msgid "Edit index"
+msgstr "Editar índice"
+
+#: tbl_indexes.php:209
+msgid "Index name:"
+msgstr "Nombre del índice:"
+
+#: tbl_indexes.php:214
+msgid ""
+"(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
+msgstr ""
+"(«PRIMARY» <b>debe</b> ser el nombre <b>exclusivamente</b> de una clave "
+"primaria)"
+
+#: tbl_indexes.php:234
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: tbl_indexes.php:249
+msgid "Index type:"
+msgstr "Tipo de índice&nbsp;:"
+>>>>>>> QA_4_0
 
 #: tbl_move_copy.php:43
 msgid "Can't move table to same one!"
diff --git a/po/fr.po b/po/fr.po
index 181cdfbc3b..df6b4850d3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12535,7 +12535,11 @@ msgstr "Colonne descriptive : "
 #: tbl_structure.php:125
 #| msgid "No rows selected"
 msgid "No column selected."
+<<<<<<< HEAD
 msgstr "Aucune colonne n'a été sélectionnée."
+=======
+msgstr "Aucune colonne n'a été sélectionnée"
+>>>>>>> QA_4_0
 
 #: tbl_structure.php:149
 #, php-format
diff --git a/po/th.po b/po/th.po
index e6109f99e2..1103d75356 100644
--- a/po/th.po
+++ b/po/th.po
@@ -724,8 +724,12 @@ msgid "Server:"
 msgstr "เซิร์ฟเวอร์"
 
 #: index.php:240
+<<<<<<< HEAD
 #, fuzzy
 msgid "Server type:"
+=======
+msgid "Server type"
+>>>>>>> QA_4_0
 msgstr "ตัวเลือกเซิร์ฟเวอร์"
 
 #: index.php:244 libraries/plugins/export/ExportLatex.class.php:225
@@ -774,10 +778,16 @@ msgstr "ส่วนขยาย PHP"
 msgid "Show PHP information"
 msgstr "แสดงข้อมูลของ PHP"
 
+<<<<<<< HEAD
 #: index.php:323
 #, fuzzy
 msgid "Version information:"
 msgstr "ข้อมูลล็อกอิน"
+=======
+#: index.php:323 libraries/engines/bdb.lib.php:25
+msgid "Version information"
+msgstr "ข้อมูลเวอร์ชัน"
+>>>>>>> QA_4_0
 
 #: index.php:332 libraries/Util.class.php:430 libraries/Util.class.php:516
 #: libraries/config/FormDisplay.tpl.php:145
diff --git a/sql.php b/sql.php
index f3794e01fd..0daeae4c5d 100644
--- a/sql.php
+++ b/sql.php
@@ -237,7 +237,7 @@ if (empty($sql_query) && strlen($table) && strlen($db)) {
     unset($book_sql_query);
 
     // set $goto to what will be displayed if query returns 0 rows
-    $goto = 'tbl_structure.php';
+    $goto = '';
 } else {
     // Now we can check the parameters
     PMA_Util::checkParameters(array('sql_query'));
@@ -910,8 +910,14 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
             $goto = 'index.php';
         }
         // Loads to target script
-        $active_page = $goto;
-        include '' . $goto;
+        if (strlen($goto) > 0) {
+            $active_page = $goto;
+            include '' . $goto;
+        } else {
+            // Echo at least one character to prevent showing last page from history
+            echo " ";
+        }
+        
     } else {
         // avoid a redirect loop when last record was deleted
         if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {