diff --git a/web/pgadmin/browser/static/js/quick_search/trigger_search.js b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
index 481d6992a..2c2f2c11c 100644
--- a/web/pgadmin/browser/static/js/quick_search/trigger_search.js
+++ b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
@@ -95,7 +95,7 @@ export function Search() {
     if(items.length > 0){
       let menuItemsHtmlElement = [];
       for(let i=0; i < items.length; i++){
-        Object.keys(items[i]).map( (value) => {
+        Object.keys(items[i]).forEach( (value) => {
           if(value != 'element' && value != 'No object selected'){
             menuItemsHtmlElement.push( <li key={ 'li-menu-' + i }><a tabIndex='0' id={ 'li-menu-' + i } href={'#'} className={ (items[i]['element'].classList.contains('disabled') == true ? 'dropdown-item menu-groups-a disabled':'dropdown-item menu-groups-a')} key={ 'menu-' + i } onClick={() => {items[i]['element'].click(); toggleDropdownMenu();}}>
               {value}
diff --git a/web/pgadmin/browser/templates/browser/js/utils.js b/web/pgadmin/browser/templates/browser/js/utils.js
index b0a317a50..0634aa70d 100644
--- a/web/pgadmin/browser/templates/browser/js/utils.js
+++ b/web/pgadmin/browser/templates/browser/js/utils.js
@@ -54,7 +54,6 @@ define('pgadmin.browser.utils',
 
   /* GET PSQL Tool related config */
   pgAdmin['enable_psql'] =  '{{ current_app.config.get('ENABLE_PSQL') }}' == 'True';
-  pgAdmin['allow_psql_shell_commands'] =  '{{ current_app.config.get('ALLOW_PSQL_SHELL_COMMANDS') }}'  == 'True';
 
   // Define list of nodes on which Query tool option doesn't appears
   var unsupported_nodes = pgAdmin.unsupported_nodes = [
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 c67ac0546..90bc0cd4a 100644
--- a/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js
+++ b/web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js
@@ -64,7 +64,7 @@
         if (nextOpen < 0) nextOpen = text.length;
         if (nextClose < 0) nextClose = text.length;
         pos = Math.min(nextOpen, nextClose);
-        if (pos == text.length) break;
+        if (pos == text.length) { whileloopvar=1; break; }
         if (cm.getTokenAt(CodeMirror.Pos(i, pos + 1)).type == tokenType) {
           if (pos == nextOpen) ++count;
           else if (!--count) {
diff --git a/web/pgadmin/tools/psql/static/js/psql_module.js b/web/pgadmin/tools/psql/static/js/psql_module.js
index 9ff02aa54..d20e04559 100644
--- a/web/pgadmin/tools/psql/static/js/psql_module.js
+++ b/web/pgadmin/tools/psql/static/js/psql_module.js
@@ -415,11 +415,7 @@ export function initialize(gettext, url_for, $, _, pgAdmin, csrfToken, Browser)
       });
 
       term.onKey(function (ev) {
-        if (pgAdmin['allow_psql_shell_commands']) {
-          socket.emit('socket_input', {'input': ev.key, 'key_name': ev.domEvent.code});
-        } else {
-          socket.emit('socket_input', {'input': ev.key, 'key_name': ev.domEvent.code});
-        }
+        socket.emit('socket_input', {'input': ev.key, 'key_name': ev.domEvent.code});
       });
     }
   };
diff --git a/web/webpack.config.js b/web/webpack.config.js
index f631178b1..1ed1761dc 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -335,7 +335,7 @@ var getThemeWebpackConfig = function(theme_name) {
 };
 
 var pgadminThemesWebpack = [];
-Object.keys(pgadminThemes).map((theme_name)=>{
+Object.keys(pgadminThemes).forEach((theme_name)=>{
   pgadminThemesWebpack.push(getThemeWebpackConfig(theme_name));
 });