diff --git a/ChangeLog b/ChangeLog
index c8c239831..f7e1a0d1e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-08-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_structure.php: more complete check before showing
+      Relation View
+
 2006-08-13 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php: bug #1519799, imagelink error
     * tbl_select.php: feature #1520222, calendar in Search
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index 589c71584..0144816d7 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -4,6 +4,13 @@
 
 require_once './libraries/common.lib.php';
 require_once './libraries/mysql_charsets.lib.php';
+require_once './libraries/relation.lib.php';
+
+/**
+ * Gets the relation settings
+ */
+$cfgRelation = PMA_getRelationsParam();
+
 
 /**
  * Drop multiple fields if required
@@ -531,11 +538,11 @@ echo $strPrintView;
 ?></a>
 
 <?php
-    if (! $tbl_is_view && ! $db_is_information_schema) {
-        // if internal relations are available, or the table type is INNODB
-    // ($tbl_type comes from libraries/tbl_properties_table_info.inc.php)
+if (! $tbl_is_view && ! $db_is_information_schema) {
 
-    if ($cfg['Server']['relation'] || $tbl_type=="INNODB") {
+    // if internal relations are available, or the table type is INNODB
+    // ($tbl_type comes from libraries/tbl_properties_table_info.inc.php)
+    if ($cfgRelation['relwork'] || $tbl_type=="INNODB") {
         ?>
 <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
         if ($cfg['PropertiesIconic']) {