diff --git a/web-server/js/cca-table.js b/web-server/js/cca-table.js
index 78a939fbb..05d1d89ac 100644
--- a/web-server/js/cca-table.js
+++ b/web-server/js/cca-table.js
@@ -51,6 +51,7 @@ $.widget("cca.table",
         self.grid.invalidate();
         self.trigger_row_selection = false;
         self.grid.setSelectedRows(sorted_rows);
+        self.grid.resetActiveCell();
         if(sorted_rows.length)
           self.grid.scrollRowToTop(Math.min.apply(Math, sorted_rows));
         self.element.trigger("variable-sort-changed", [column, order]);
@@ -172,6 +173,7 @@ $.widget("cca.table",
     {
       self.trigger_row_selection = false;
       self.grid.setSelectedRows(sorted_rows);
+      self.grid.resetActiveCell();
       if(sorted_rows.length)
         self.grid.scrollRowToTop(Math.min.apply(Math, sorted_rows));
     });
@@ -198,6 +200,7 @@ $.widget("cca.table",
       {
         self.trigger_row_selection = false;
         self.grid.setSelectedRows(sorted_rows);
+        self.grid.resetActiveCell();
         if(sorted_rows.length)
           self.grid.scrollRowToTop(Math.min.apply(Math, sorted_rows));
       });
diff --git a/web-server/js/timeseries-table.js b/web-server/js/timeseries-table.js
index ee55ed886..0682d7007 100644
--- a/web-server/js/timeseries-table.js
+++ b/web-server/js/timeseries-table.js
@@ -92,6 +92,7 @@ $.widget("timeseries.table",
           var selectedRows = self.data.getSimulationRowIndexes(self.options["row-selection"]);
           self.trigger_row_selection = false;
           self.grid.setSelectedRows(selectedRows);
+          self.grid.resetActiveCell();
           if(selectedRows.length)
             self.grid.scrollRowToTop(Math.min.apply(Math, selectedRows));
         }
@@ -112,7 +113,7 @@ $.widget("timeseries.table",
       var selectedRows = self.data.getSimulationRowIndexes(self.options["row-selection"]);
       self.trigger_row_selection = false;
       self.grid.setSelectedRows(selectedRows);
-      
+      self.grid.resetActiveCell();
       if(selectedRows.length)
         self.grid.scrollRowToTop(Math.min.apply(Math, selectedRows));
     }
@@ -174,6 +175,7 @@ $.widget("timeseries.table",
           var selectedRows = self.data.getSimulationRowIndexes(self.options["row-selection"]);
           self.trigger_row_selection = false;
           self.grid.setSelectedRows(selectedRows);
+          self.grid.resetActiveCell();
           if(selectedRows.length)
             self.grid.scrollRowToTop(Math.min.apply(Math, selectedRows));
         }
@@ -253,6 +255,7 @@ $.widget("timeseries.table",
           var selectedRows = self.data.getSimulationRowIndexes(self.options["row-selection"]);
           self.trigger_row_selection = false;
           self.grid.setSelectedRows(selectedRows);
+          self.grid.resetActiveCell();
           if(selectedRows.length)
             self.grid.scrollRowToTop(Math.min.apply(Math, selectedRows));
         }