diff --git a/web/pgadmin/static/js/selection/active_cell_capture.js b/web/pgadmin/static/js/selection/active_cell_capture.js
index 442766ce0..c183cf1ef 100644
--- a/web/pgadmin/static/js/selection/active_cell_capture.js
+++ b/web/pgadmin/static/js/selection/active_cell_capture.js
@@ -108,7 +108,7 @@ define([
         }
 
         if (isClickingLastClickedHeader(rowClicked, 1)) {
-          if (isSingleRangeSelected()) {
+          if (isSingleRangeSelected() || grid.getSelectionModel().getSelectedRanges().length === 0) {
             grid.resetActiveCell();
           } else {
             grid.setActiveCell(retrievePreviousSelectedRange().fromRow, 1);