diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 6a7c773c7..2720b5104 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -119,7 +119,7 @@ $(document).ready(function() {
          */
         var curr_row = $(this).parents('tr');
 
-        var question = $(curr_row).children('.drop_primary_key_index_msg').val();
+        var question = $(curr_row).children('td').children('.drop_primary_key_index_msg').val();
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 53ea62db4..6fc0bec09 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -476,8 +476,9 @@ class PMA_Index
                     $js_msg      = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName());
                 }
 
-                $r .= '<td ' . $row_span . '>'
-                    . '    <a ';
+                $r .= '<td ' . $row_span . '>';
+                $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
+                $r .= '    <a ';
                 if ($GLOBALS['cfg']['AjaxEnable']) {
                     $r .= 'class="drop_primary_key_index_anchor" ';
                 }
@@ -485,8 +486,6 @@ class PMA_Index
                    . '" >'
                    . PMA_getIcon('b_drop.png', __('Drop'))  . '</a>'
                    . '</td>' . "\n";
-
-                $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
             }
 
             $r .= '<th ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</th>';