diff --git a/docs/en_US/release_notes_4_1.rst b/docs/en_US/release_notes_4_1.rst
index a5f2056e2..ff73b5397 100644
--- a/docs/en_US/release_notes_4_1.rst
+++ b/docs/en_US/release_notes_4_1.rst
@@ -2,7 +2,7 @@
 Version 4.1
 ***********
 
-Release date: 2019-02-07
+Release date: 2019-01-15
 
 This release contains a number of features and fixes reported since the release of pgAdmin4 4.0
 
@@ -19,4 +19,5 @@ Bug fixes
 | `Bug #3836 <https://redmine.postgresql.org/issues/3836>`_ - Fix ordering of VACUUM options which changed in PG11.
 | `Bug #3842 <https://redmine.postgresql.org/issues/3842>`_ - Don't show system catalogs in the schemas property list unless show system objects is enabled.
 | `Bug #3861 <https://redmine.postgresql.org/issues/3861>`_ - Fix help for the backup/restore dialogues.
+| `Bug #3866 <https://redmine.postgresql.org/issues/3866>`_ - Ensure that last row of table data should be visible and user will be able to add new row.
 | `Bug #3877 <https://redmine.postgresql.org/issues/3877>`_ - Make the browser more robust in the face of multibyte characters in SQL_ASCII databases.
\ No newline at end of file
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 1a263784d..5aa653337 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -62,6 +62,7 @@ $gray-900: $color-fg-theme;
 $body-color: $color-fg-theme;
 $font-size-base: 0.875rem;
 $line-height-base: 1.5; // no change
+$text-height-calc: $line-height-base*$font-size-base/1rem;
 $grid-gutter-width: 15px;
 $border-radius: 0.25rem; //no change
 
@@ -169,6 +170,8 @@ $datagrid-bg: $color-gray-light;
 $sql-title-padding: 3px;
 $sql-title-bg: $color-gray-darker;
 $sql-title-fg: $white;
+// Toolbar + editor title heights + title bottom border
+$sql-editor-panel-top: $title-height + $text-height-calc*16px + $sql-title-padding*2 + $panel-border-width;
 $sql-gutters-bg: $color-gray-light;
 $sql-history-detail-bg: $color-gray-lighter;
 $sql-history-success-bg: $color-primary-light;
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
index 5d425bb8b..a1cac04da 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_sqleditor.scss
@@ -18,6 +18,15 @@
   z-index: 0;
 }
 
+#editor-panel {
+  z-index: 0;
+  position: absolute;
+  top: $sql-editor-panel-top;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
 #editor-panel .CodeMirror-activeline-background {
   background: $color-primary-light;
 }