diff --git a/web/pgadmin/static/js/Theme/overrides/codemirror.override.js b/web/pgadmin/static/js/Theme/overrides/codemirror.override.js
index 56ed86e56..acd6e9fb5 100644
--- a/web/pgadmin/static/js/Theme/overrides/codemirror.override.js
+++ b/web/pgadmin/static/js/Theme/overrides/codemirror.override.js
@@ -80,6 +80,9 @@ export default function cmOverride(theme) {
         '& .cm-foldGutter': {
           padding: '0px',
           color: editor.fg,
+          '& .cm-gutterElement': {
+            width: '18px',
+          }
         },
 
         '& .cm-breakpoint-gutter': {
diff --git a/web/pgadmin/static/js/components/ReactCodeMirror/components/Editor.jsx b/web/pgadmin/static/js/components/ReactCodeMirror/components/Editor.jsx
index a032e319c..d6e4c08e0 100644
--- a/web/pgadmin/static/js/components/ReactCodeMirror/components/Editor.jsx
+++ b/web/pgadmin/static/js/components/ReactCodeMirror/components/Editor.jsx
@@ -50,8 +50,8 @@ import activeLineExtn from '../extensions/activeLineMarker';
 import currentQueryHighlighterExtn from '../extensions/currentQueryHighlighter';
 import { autoCompleteCompartment, indentNewLine } from '../extensions/extraStates';
 
-const arrowRightHtml = ReactDOMServer.renderToString(<KeyboardArrowRightRoundedIcon style={{fontSize: '1.2em'}} />);
-const arrowDownHtml = ReactDOMServer.renderToString(<ExpandMoreRoundedIcon style={{fontSize: '1.2em'}} />);
+const arrowRightHtml = ReactDOMServer.renderToString(<KeyboardArrowRightRoundedIcon style={{width: '16px'}} />);
+const arrowDownHtml = ReactDOMServer.renderToString(<ExpandMoreRoundedIcon style={{width: '16px'}} />);
 
 function handleDrop(e, editor) {
   let dropDetails = null;
diff --git a/web/pgadmin/static/js/helpers/Notifier.jsx b/web/pgadmin/static/js/helpers/Notifier.jsx
index 97ad063bf..4d90954fe 100644
--- a/web/pgadmin/static/js/helpers/Notifier.jsx
+++ b/web/pgadmin/static/js/helpers/Notifier.jsx
@@ -207,6 +207,7 @@ export function NotifierProvider({ pgAdmin, pgWindow, getInstance, children, onR
             getInstance?.(pgAdmin.Browser.notifier);
             onReady?.();
           }}
+          disableWindowBlurListener={true}
         >
           {children}
         </SnackbarProvider>