diff --git a/docs/en_US/release_notes_6_0.rst b/docs/en_US/release_notes_6_0.rst
index 40d46ffa0..70fbfdaff 100644
--- a/docs/en_US/release_notes_6_0.rst
+++ b/docs/en_US/release_notes_6_0.rst
@@ -22,6 +22,7 @@ Bug fixes
 *********
 
 | `Issue #2546 <https://redmine.postgresql.org/issues/2546>`_ -  Added support to create the Partitioned table using COLLATE and opclass.
+| `Issue #3827 <https://redmine.postgresql.org/issues/3827>`_ -  Ensure that in the Query History tab, query details should be scrollable.
 | `Issue #6712 <https://redmine.postgresql.org/issues/6712>`_ -  Fixed an issue where collapse and expand arrows mismatch in case of nested IF.
 | `Issue #6713 <https://redmine.postgresql.org/issues/6713>`_ -  Fixed an issue where the last message is not visible in the Debugger.
 | `Issue #6724 <https://redmine.postgresql.org/issues/6724>`_ -  Fixed an issue where the drop cascade button enables for Databases.
diff --git a/web/pgadmin/tools/sqleditor/static/scss/_history.scss b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
index fe9ef8ea9..cbb7b0297 100644
--- a/web/pgadmin/tools/sqleditor/static/scss/_history.scss
+++ b/web/pgadmin/tools/sqleditor/static/scss/_history.scss
@@ -96,6 +96,7 @@
 .query-detail {
   height: 100%;
   width: 100%;
+  min-height: 19em;
   display: flex;
   flex-direction: column;
   background-color: $color-bg;
@@ -156,7 +157,7 @@
     flex: 5;
     margin-left: 10px;
     margin-right: 10px;
-    height: 0;
+    min-height: 1em;
     position: relative;
 
     .copy-all, .was-copied, .copy-to-editor {
@@ -196,6 +197,7 @@
     flex: 2;
     display: flex;
     padding: 0 20px;
+    min-height: 6em;
 
     .message {
       flex: 2 2 0%;