diff --git a/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts b/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts
index 572efd31d2..45ae831446 100644
--- a/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts
+++ b/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts
@@ -191,7 +191,8 @@ export class CheckboxSelectColumn<T extends Slick.SlickData> implements Slick.Pl
 			this._grid.render();
 		}
 
-		//Ensure that the focus stays correct
+		//Ensure that the focus stays on current selected checkbox cell
+		this._grid.setActiveCell(row, col);
 		if (this._grid.getActiveCellNode()) {
 			this._grid.getActiveCellNode().focus();
 		}