diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
index e04c7955c7..c4ec3a93bc 100644
--- a/libraries/DatabaseInterface.class.php
+++ b/libraries/DatabaseInterface.class.php
@@ -1388,7 +1388,7 @@ class PMA_DatabaseInterface
                 WHERE table_schema = '" . PMA_Util::sqlAddSlashes($database) . "'
                     AND table_name = '" . PMA_Util::sqlAddSlashes($table) . "'
                     " . (
-                        ($column != null)
+                        (! empty($column))
                             ? "
                     AND column_name = '" . PMA_Util::sqlAddSlashes($column) . "'"
                             : ''
@@ -1397,7 +1397,7 @@ class PMA_DatabaseInterface
         } else {
             $sql = 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS FROM '
                 . PMA_Util::backquote($database) . '.' . PMA_Util::backquote($table)
-                . (($column != null) ? "LIKE '"
+                . ((! empty($column)) ? "LIKE '"
                 . PMA_Util::sqlAddSlashes($column, true) . "'" : '');
         }
         return $sql;