diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index 658f091..35e1bf3 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -97,6 +97,7 @@ class SqlEditorModule(PgAdminModule):
             'sqleditor.query_tool_start',
             'sqleditor.poll',
             'sqleditor.fetch',
+            'sqleditor.fetch_till',
             'sqleditor.fetch_all',
             'sqleditor.save',
             'sqleditor.inclusive_filter',
@@ -533,18 +534,24 @@ def poll(trans_id):
     '/fetch/<int:trans_id>/<int:fetch_all>', methods=["GET"],
     endpoint='fetch_all'
 )
+@blueprint.route(
+    '/fetch/<int:trans_id>/<int:fetch_till>', methods=["GET"],
+    endpoint='fetch_till'
+)
 @login_required
-def fetch(trans_id, fetch_all=None):
+def fetch(trans_id, fetch_all=None, fetch_till=None):
     result = None
     has_more_rows = False
     rows_fetched_from = 0
     rows_fetched_to = 0
-    fetch_row_cnt = -1 if fetch_all == 1 else ON_DEMAND_RECORD_COUNT
 
     # Check the transaction and connection status
     status, error_msg, conn, trans_obj, session_obj = \
         check_transaction_status(trans_id)
 
+    fetch_row_cnt = -1 if fetch_all == 1 else ON_DEMAND_RECORD_COUNT \
+        if fetch_till is None else fetch_till - trans_obj.get_fetched_row_cnt()
+
     if error_msg == gettext('Transaction ID not found in the session.'):
         return make_json_response(success=0, errormsg=error_msg,
                                   info='DATAGRID_TRANSACTION_REQUIRED',
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index c291dac..59b0704 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -737,6 +737,12 @@ define('tools.querytool', [
 
     // This function is responsible to create and render the SlickGrid.
     render_grid: function(collection, columns, is_editable, client_primary_key, rows_affected) {
+      if (rows_affected) {
+        let dummyCollection = new Array(rows_affected - collection.length);
+        // Adding dummy rows to adjust height, rows data will be update as and when user scrolls down in DataView panel
+        dummyCollection.fill([gettext('Loading...')]);
+        collection = [...collection, ...dummyCollection];
+      }
       var self = this;
 
       self.handler.numberOfModifiedCells = 0;
@@ -1206,13 +1212,13 @@ define('tools.querytool', [
         $('#btn-save-data').prop('disabled', false);
       }.bind(editor_data));
 
-      // Listen grid viewportChanged event to load next chunk of data.
-      grid.onViewportChanged.subscribe(function(e, args) {
-        var rendered_range = args.grid.getRenderedRange(),
-          data_len = args.grid.getDataLength();
-        // start fetching next batch of records before reaching to bottom.
-        if (self.handler.has_more_rows && !self.handler.fetching_rows && rendered_range.bottom > data_len - 100) {
-          // fetch asynchronous
+      grid.onScroll.subscribe((e, args) => {
+        if (self.handler.has_more_rows && !self.handler.fetching_rows && args.grid.getViewport().bottom > self.handler.rows_fetched_to + self.handler.rows_fetch_batch_count) {
+          // fast scrolling
+          let fetch_till = ((args.grid.getViewport().bottom % self.handler.rows_fetch_batch_count) + 1) * self.handler.rows_fetch_batch_count;
+          self.fetch_next(null, null, fetch_till);
+        } else if (self.handler.has_more_rows && !self.handler.fetching_rows && args.grid.getViewport().bottom + 100 > self.handler.rows_fetched_to) {
+          // gentle scroll
           setTimeout(self.fetch_next.bind(self));
         }
       });
@@ -1261,7 +1267,7 @@ define('tools.querytool', [
       this.fetch_next(true, cb);
     },
 
-    fetch_next: function(fetch_all, cb) {
+    fetch_next: function(fetch_all, cb, fetch_till) {
       var self = this,
         url = '';
 
@@ -1282,11 +1288,18 @@ define('tools.querytool', [
           'fetch_all': 1,
         });
       } else {
-        url = url_for('sqleditor.fetch', {
-          'trans_id': self.transId,
-        });
+        if (fetch_till) {
+          url = url_for('sqleditor.fetch_till', {
+            'trans_id': self.transId,
+            fetch_till: fetch_till,
+          });
+        } else {
+          url = url_for('sqleditor.fetch', {
+            'trans_id': self.transId,
+          });
+        }
       }
-
+      self.handler.last_rows_fetched_to = self.handler.rows_fetched_to;
       $.ajax({
         url: url,
         method: 'GET',
@@ -1296,6 +1309,7 @@ define('tools.querytool', [
           $('#btn-flash').prop('disabled', false);
           $('#btn-download').prop('disabled', false);
           self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
+          self.handler.rows_fetched_to = res.data.rows_fetched_to;
           self.update_grid_data(res.data.result);
           self.handler.fetching_rows = false;
           if (typeof cb == 'function') {
@@ -1322,16 +1336,15 @@ define('tools.querytool', [
 
     update_grid_data: function(data) {
       this.dataView.beginUpdate();
-
-      for (var i = 0; i < data.length; i++) {
+      for (var i = 0, k = this.handler.last_rows_fetched_to; k < this.handler.rows_fetched_to; i++ , k++) {
         // Convert 2darray to dict.
         var item = {};
         for (var j = 1; j < this.grid_columns.length; j++) {
           item[this.grid_columns[j]['field']] = data[i][this.grid_columns[j]['pos']];
         }
 
-        item[this.client_primary_key] = (this.client_primary_key_counter++).toString();
-        this.dataView.addItem(item);
+        item['__temp_PK'] = k;
+        this.dataView.updateItem(k, item);
       }
 
       this.dataView.endUpdate();
@@ -2228,6 +2241,7 @@ define('tools.querytool', [
         self.marked_line_no = 0;
         self.has_more_rows = false;
         self.fetching_rows = false;
+        self.rows_fetched_to = 0;
         self.close_on_save = false;
         self.close_on_idle_transaction = false;
         self.last_transaction_status = -1;
@@ -2674,6 +2688,8 @@ define('tools.querytool', [
               // Make sure - the 'Data Output' panel is visible, before - we
               // start rendering the grid.
               self.gridView.data_output_panel.focus();
+              self.gridView.handler.rows_fetched_to = data.rows_fetched_to;
+              self.gridView.handler.rows_fetch_batch_count = data.rows_fetched_to - (data.rows_fetched_from - 1);
               setTimeout(
                 function() {
                   self.gridView.render_grid(data.result, self.columns,