diff --git a/docs/en_US/release_notes_8_14.rst b/docs/en_US/release_notes_8_14.rst
index 44cc1db73..94e9f79c1 100644
--- a/docs/en_US/release_notes_8_14.rst
+++ b/docs/en_US/release_notes_8_14.rst
@@ -30,4 +30,6 @@ Housekeeping
 Bug fixes
 *********
   | `Issue #5099 <https://github.com/pgadmin-org/pgadmin4/issues/5099>`_ -  Fixed an issue where Ctrl/Cmd + A was not selecting all data in query tool data grid.
+  | `Issue #8010 <https://github.com/pgadmin-org/pgadmin4/issues/5099>`_ -  Fixed an issue where query tool should show results and messages only from the last executed query.
+  | `Issue #8127 <https://github.com/pgadmin-org/pgadmin4/issues/8127>`_ -  Fixed an issue where query tool should not prompt for unsaved changes when there are no changes.
 
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index 513f338d5..4383b9f14 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -401,9 +401,8 @@ export default function QueryToolDataGrid({columns, rows, totalRowCount, dataCha
     }
 
     // Handle Select All Cmd + A(mac) / Ctrl + a (others)
-    if((isMac() && e.metaKey) || (!isMac() && e.ctrlKey) && e.key === 'a') {
+    if(((isMac() && e.metaKey) || (!isMac() && e.ctrlKey)) && e.key === 'a') {
       e.preventDefault();
-      onSelectedColumnsChangeWrapped(new Set());
       eventBus.fireEvent(QUERY_TOOL_EVENTS.TRIGGER_SELECT_ALL);
     }
   }
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index d46ccf480..ed439dabc 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -1038,6 +1038,7 @@ export function ResultSet() {
       } else {
         setAllRowsSelect('NONE');
       }
+      setSelectedColumns(new Set());
     });
 
     eventBus.registerListener(QUERY_TOOL_EVENTS.ALL_ROWS_SELECTED, ()=>{