diff --git a/tbl_structure.php b/tbl_structure.php
index 4cd4b0551..637a24bbb 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -429,10 +429,10 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
             'geometry', 'point', 'linestring', 'polygon', 'multipoint',
             'multilinestring', 'multipolygon', 'geomtrycollection'
         );
-        if (! in_array($type, $spatial_types) || 'MYISAM' != $tbl_type) {
-            $spatial_enabled = false;
-        } else {
+        if (in_array($type, $spatial_types) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) {
             $spatial_enabled = true;
+        } else {
+            $spatial_enabled = false;
         }
         ?>
         <a <?php echo $spatial_enabled ? '' : ' class="disabled"'; ?>href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD SPATIAL(' . PMA_backquote($row['Field']) . ')'); ?>&amp;message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">