diff --git a/extensions/mssql/src/config.json b/extensions/mssql/src/config.json
index fb306cdd83..60784d1a59 100644
--- a/extensions/mssql/src/config.json
+++ b/extensions/mssql/src/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "1.5.0-alpha.22",
+	"version": "1.5.0-alpha.27",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.1.zip",
 		"Windows_64": "win-x64-netcoreapp2.1.zip",
diff --git a/package.json b/package.json
index 26c01e29f0..f4b3772c71 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@angular/router": "~4.1.3",
     "@angular/upgrade": "~4.1.3",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.1",
+    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.3",
     "applicationinsights": "0.18.0",
     "chart.js": "^2.6.0",
     "fast-plist": "0.1.2",
diff --git a/src/sql/parts/grid/views/editData/editData.component.ts b/src/sql/parts/grid/views/editData/editData.component.ts
index 38e8e729f0..ca0af49d8b 100644
--- a/src/sql/parts/grid/views/editData/editData.component.ts
+++ b/src/sql/parts/grid/views/editData/editData.component.ts
@@ -457,9 +457,11 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 				}
 			} finally {
 				// The operation may fail if there were no changes sent to the service to revert,
-				// so clear any existing client-side edit and refresh the table regardless
+				// so clear any existing client-side edit and refresh on-screen data
+				// do not refresh the whole dataset as it will move the focus away to the first row.
+				//
 				this.currentEditCellValue = null;
-				this.refreshResultsets();
+				this.dataSet.dataRows.resetWindowsAroundIndex(this.currentCell.row);
 			}
 		}
 	}
diff --git a/src/typings/modules/angular2-slickgrid/index.d.ts b/src/typings/modules/angular2-slickgrid/index.d.ts
index 7e55ecd755..41128dcd45 100644
--- a/src/typings/modules/angular2-slickgrid/index.d.ts
+++ b/src/typings/modules/angular2-slickgrid/index.d.ts
@@ -57,6 +57,7 @@ export interface IObservableCollection<T> {
     at(index: number): T;
     getRange(start: number, end: number): T[];
     setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void;
+    resetWindowsAroundIndex(index: number): void;
 }
 export class CancellationToken {
     private _isCanceled;
@@ -291,7 +292,7 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
     getRange(start: number, end: number): TData[];
     private getRangeFromCurrent(start, end);
     private getDataFromCurrent(index);
-    private resetWindowsAroundIndex(index);
+    resetWindowsAroundIndex(index);
 }
 }
 declare module 'angular2-slickgrid/out/js/virtualizedCollection' {