diff --git a/ChangeLog b/ChangeLog
index 145aff04bb..be0fa788a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - issue #12502 Remove unused paramenter when connecting to MySQLi
 - issue #12303 Fix number formatting with different settings of precision in PHP
 - issue #12405 Use single quotes in PHP code
+- issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 6dd5ce0ab6..efd2daf646 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -233,8 +233,16 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     }
                     $after_field_item.remove();
                     $curr_row.hide("medium").remove();
-                    //by default select the last option to add new column (in case last column is dropped)
+
+                    // Remove the dropped column from select menu for 'after field'
+                    $("select[name=after_field]").find(
+                        '[value="' + curr_column_name.trim() + '"]'
+                    ).remove();
+
+                    // by default select the (new) last option to add new column
+                    // (in case last column is dropped)
                     $("select[name=after_field] option:last").attr("selected","selected");
+
                     //refresh table stats
                     if (data.tableStat) {
                         $('#tablestatistics').html(data.tableStat);