diff --git a/js/functions.js b/js/functions.js
index aa820b5a6..2cd1c4758 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -2034,6 +2034,19 @@ $(document).ready(function() {
     })
     //end Drop Primary Key/Index
 
+    //Calculate Real End for InnoDB
+    $('#real_end_input').live('click', function(event) {
+        event.preventDefault();
+
+        var question = PMA_messages['strOperationTakesLongTime'];
+
+        $(this).PMA_confirm(question, '', function() {
+            return true;
+        })
+        return false;
+    })
+    //end Calculate Real End for InnoDB
+
 }, 'top.frame_content'); //end $(document).ready() for db_structure.php
 
 /**
diff --git a/js/messages.php b/js/messages.php
index 99d144764..e495ff044 100755
--- a/js/messages.php
+++ b/js/messages.php
@@ -34,6 +34,7 @@ $js_messages['strDroppingProcedure'] = __('Dropping Procedure');
 $js_messages['strDeleteTrackingData'] = __('Delete tracking data for this table');
 $js_messages['strDeletingTrackingData'] = __('Deleting tracking data');
 $js_messages['strDroppingPrimaryKeyIndex'] = __('Dropping Primary Key/Index');
+$js_messages['strOperationTakesLongTime'] = __('This operation could take a long time. Proceed anyway?');
 
 /* For blobstreaming */
 $js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!');
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5238d937f..82511892c 100755
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -341,9 +341,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
 
         // prepare some options for the End button
         if ($is_innodb && $unlim_num_rows > $GLOBALS['cfg']['MaxExactCount']) {
-            $input_for_real_end = '<input type="hidden" name="find_real_end" value="1" />';
+            $input_for_real_end = '<input id="real_end_input" type="hidden" name="find_real_end" value="1" />';
             // no backquote around this message
-            $onclick = ' onclick="return confirmAction(\'' . PMA_jsFormat(__('This operation could take a long time. Proceed anyway?'), false) . '\')"';
+            $onclick = '';
         } else {
             $input_for_real_end = $onclick = '';
         }