diff --git a/docs/en_US/release_notes_5_3.rst b/docs/en_US/release_notes_5_3.rst
index fc30a094c..fb0637dc0 100644
--- a/docs/en_US/release_notes_5_3.rst
+++ b/docs/en_US/release_notes_5_3.rst
@@ -26,3 +26,4 @@ Bug fixes
 | `Issue #6385 <https://redmine.postgresql.org/issues/6385>`_ -  Ensure that Backup and Restore should work on shared servers.
 | `Issue #6408 <https://redmine.postgresql.org/issues/6408>`_ -  Fixed ModuleNotFoundError when running setup.py from outside of the root.
 | `Issue #6416 <https://redmine.postgresql.org/issues/6416>`_ -  Added comment column in the properties panel for View and Materialized View collection node.
+| `Issue #6417 <https://redmine.postgresql.org/issues/6417>`_ -  Fixed an issue where query editor is not being closed if the user clicks on the 'Don't Save' button.
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index d44d4ea47..1ef690e55 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -4965,6 +4965,7 @@ define('tools.querytool', [
                 break;
               case 1: // Don't Save
                 self.close_on_save = false;
+                self.is_unsaved_data = this.is_unsaved_data;
                 $.ajax({
                   url: url_for('sqleditor._check_server_connection_status', {
                     'sid': self.url_params.sid,
@@ -4977,7 +4978,7 @@ define('tools.querytool', [
                   let response = res.data.result.server;
                   if (response) {
                     closeEvent.cancel = true;
-                    if (this.is_unsaved_data)
+                    if (self.is_unsaved_data)
                       self.ignore_on_close.unsaved_data = true;
                     else
                       self.ignore_on_close.unsaved_query = true;