diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 955e7c8c5..bfdde2369 100755
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -57,6 +57,15 @@ if (isset($submitcollation) && !empty($db_collation)) {
     $result           = PMA_DBI_query($sql_query);
     $message          = PMA_Message::success();
     unset($db_charset, $db_collation);
+
+    /**
+     * If we are in an Ajax request, let us stop the execution here. Necessary for
+     * db charset change action on db_operations.php.  If this causes a bug on
+     * other pages, we might have to move this to a different location.
+     */
+    if( $GLOBALS['is_ajax_request'] == true) {
+        PMA_ajaxResponse($message, $message->isSuccess());
+    };
 }
 
 $GLOBALS['js_include'][] = 'functions.js';