diff --git a/tbl_alter.php b/tbl_alter.php
index 961a5a5e00..4664cd172d 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -175,7 +175,7 @@ if (isset($_REQUEST['do_save_data'])) {
  * $selected comes from multi_submits.inc.php
  */
 if ($abort == false) {
-    if ($_REQUEST['ajax_request'] != true) {
+    if (!isset($_REQUEST['ajax_request']) || $_REQUEST['ajax_request'] != true) {
         include_once 'libraries/tbl_links.inc.php';
     }
 
diff --git a/tbl_operations.php b/tbl_operations.php
index da5676e2ee..ccdd68ebc1 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -225,7 +225,7 @@ if (isset($result) && empty($message_to_show)) {
         $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error'));
         // $result should exist, regardless of $_message
         $_type = $result ? 'success' : 'error';
-        if ( $_REQUEST['ajax_request'] == true) {
+        if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
             $extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
             PMA_ajaxResponse($_message, $_message->isSuccess(), $extra_data);
         }
@@ -244,7 +244,7 @@ if (isset($result) && empty($message_to_show)) {
     unset($_message, $_type);
 }
 
-$url_params['goto'] = 'tbl_operations.php';
+$url_params['goto'] =
 $url_params['back'] = 'tbl_operations.php';
 
 /**