diff --git a/ChangeLog b/ChangeLog
index be73faacbe..818051eb1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog
 - bug #4984 Undefined <feature>work upon upgrade to new version
 
 4.4.13.0 (not yet released)
+- issue #1808 "Improve table structure" generates invalid SQL
 
 4.4.12.0 (2015-07-20)
 - bug       Saved chart image does not have a proper name or an extension
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
index 68e578cec3..afeaa29b76 100644
--- a/libraries/create_addfield.lib.php
+++ b/libraries/create_addfield.lib.php
@@ -106,6 +106,10 @@ function PMA_setColumnCreationStatementSuffix($current_field_num,
         return $sql_suffix;
     }
 
+    if ($_REQUEST['field_where'] == 'last') {
+        return $sql_suffix;
+    }
+
     // Only the first field can be added somewhere other than at the end
     if ($current_field_num == 0) {
         if ($_REQUEST['field_where'] == 'first') {