diff --git a/ChangeLog b/ChangeLog
index 814553b59..ec8caa2e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2537766 [import] Comments are stripped when editing store procedures 
 - bug #2852370 [operations] Renaming database deletes triggers 
 - bug #2872247 [interface] Failed opening required 'mysql_charsets.lib.php', thanks to CyberLeo Kitsana - cyberleo
-
+- bug [structure] "In use" table incorrectly reported as "view" 
 
 3.2.2.0 (2009-09-13)
 - bug #2825293 [structure] Default value for a BIT column
diff --git a/db_structure.php b/db_structure.php
index 4a06801ae..f8bb10b90 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -337,14 +337,18 @@ foreach ($tables as $keyname => $each_table) {
                 $unit          =  '';
             }
             break;
-        // for a view, the ENGINE is null
+            // for a view, the ENGINE is sometimes reported as null,
+            // or on some servers it's reported as "SYSTEM VIEW" 
         case null :
         case 'SYSTEM VIEW' :
-            // countRecords() takes care of $cfg['MaxExactCountViews']
-            $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db,
+            // if table is broken, Engine is reported as null, so one more test 
+            if ($each_table['TABLE_TYPE'] == 'VIEW') {
+                // countRecords() takes care of $cfg['MaxExactCountViews']
+                $each_table['TABLE_ROWS'] = PMA_Table::countRecords($db,
                     $each_table['TABLE_NAME'], $return = true, $force_exact = true,
                     $is_view = true);
-            $table_is_view = true;
+                $table_is_view = true;
+            }
             break;
         default :
             // Unknown table type.