diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 2d6a9108fc..e9e8871fe4 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -200,17 +200,17 @@ function PMA_getHtmlForActivateDeactivateTracking(
     switch($action) {
     case 'activate':
         $legend = __('Activate tracking for %s');
-        $hidden = "submit_activate_now";
+        $value = "activate_now";
         $button = __('Activate now');
         break;
     case 'deactivate':
         $legend = __('Deactivate tracking for %s');
-        $hidden = "submit_deactivate_now";
+        $value = "deactivate_now";
         $button = __('Deactivate now');
         break;
     default:
         $legend = '';
-        $hidden = '';
+        $value = '';
         $button = '';
     }
 
@@ -220,7 +220,7 @@ function PMA_getHtmlForActivateDeactivateTracking(
     );
     $html .= '</legend>';
     $html .= '<input type="hidden" name="version" value="' . $last_version . '" />';
-    $html .= '<input type="hidden" name="' . $hidden . '" value="1" />';
+    $html .= '<input type="hidden" name="toggle_activation" value="' . $value . '" />';
     $html .= '<input type="submit" value="' . $button . '" />';
     $html .= '</fieldset>';
     $html .= '</form>';
diff --git a/tbl_tracking.php b/tbl_tracking.php
index f0a5fe1cdb..e82e6198e1 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -23,7 +23,8 @@ require './libraries/tbl_common.inc.php';
 
 if (PMA_Tracker::isActive()
     && PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
-    && ! isset($_REQUEST['submit_deactivate_now'])
+    && ! (isset($_REQUEST['toggle_activation'])
+    && $_REQUEST['toggle_activation'] == 'deactivate_now')
     && ! (isset($_REQUEST['report_export'])
     && $_REQUEST['export_type'] == 'sqldumpfile')
 ) {
@@ -118,12 +119,16 @@ if (isset($_REQUEST['submit_create_version'])) {
 }
 
 // Deactivate tracking
-if (isset($_REQUEST['submit_deactivate_now'])) {
+if (isset($_REQUEST['toggle_activation'])
+    && $_REQUEST['toggle_activation'] == 'deactivate_now'
+) {
     $html .= PMA_deactivateTracking();
 }
 
 // Activate tracking
-if (isset($_REQUEST['submit_activate_now'])) {
+if (isset($_REQUEST['toggle_activation'])
+    && $_REQUEST['toggle_activation'] == 'activate_now'
+) {
     $html .= PMA_activateTracking();
 }