diff --git a/docs/en_US/release_notes_5_7.rst b/docs/en_US/release_notes_5_7.rst
index 905f2d3a1..fbcebac32 100644
--- a/docs/en_US/release_notes_5_7.rst
+++ b/docs/en_US/release_notes_5_7.rst
@@ -9,7 +9,7 @@ This release contains a number of bug fixes and new features since the release o
 New features
 ************
 
-
+| `Issue #4264 <https://redmine.postgresql.org/issues/4264>`_ -  Make code folding case insensitive in the code mirror.
 
 Housekeeping
 ************
diff --git a/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js b/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js
index 90bc0cd4a..2ef304119 100644
--- a/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js
+++ b/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js
@@ -27,7 +27,7 @@
     let startTkn = tokenSet[tokenSetNo].start,
       endTkn = tokenSet[tokenSetNo].end;
     while (at > 0) {
-      var found = lineText.lastIndexOf(startTkn, at);
+      var found = lineText.toUpperCase().lastIndexOf(startTkn, at);
       var startToken = startTkn;
       var endToken = endTkn;
 
@@ -50,12 +50,12 @@
       }
       at = found - 1;
     }
-    if (startChar == null || lineText.lastIndexOf(startToken) > startChar) return;
+    if (startChar == null || lineText.toUpperCase().lastIndexOf(startToken) > startChar) return;
     var count = 1,
       lastLine = cm.lineCount(),
       end, endCh;
     outer: for (var i = line + 1; i < lastLine; ++i) {
-      var text = cm.getLine(i),
+      var text = cm.getLine(i).toUpperCase(),
         pos = 0;
       var whileloopvar = 0;
       while (whileloopvar < 1) {