diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index 25001091a..ee68a2759 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -18,6 +18,9 @@ import threading
 import math
 
 import json
+
+from sqlalchemy import or_
+
 from config import PG_DEFAULT_DRIVER, ALLOW_SAVE_PASSWORD, SHARED_STORAGE
 from werkzeug.user_agent import UserAgent
 from flask import Response, url_for, render_template, session, current_app
@@ -2353,7 +2356,9 @@ def get_new_connection_data(sgid=None, sid=None):
         server_groups = ServerGroup.query.all()
         server_group_data = {server_group.name: [] for server_group in
                              server_groups}
-        servers = Server.query.filter(Server.is_adhoc == 0)
+        servers = Server.query.filter(
+            or_(Server.user_id == current_user.id, Server.shared),
+            Server.is_adhoc == 0)
 
         for server in servers:
             manager = driver.connection_manager(server.id)
diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index d6de3d52f..36fd409e9 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -76,10 +76,10 @@ const StyledPgReactDataGrid = styled(PgReactDataGrid)(({stripedRows, theme})=>({
   }},
   '& .rdg-row': {
     '& .rdg-cell:nth-of-type(1)': {
-      backgroundColor: theme.palette.grey[600],
+      backgroundColor: theme.palette.grey[600] + '!important',
     },
     '&[aria-selected="true"] .rdg-cell:nth-of-type(1)': {
-      backgroundColor: theme.palette.primary.main,
+      backgroundColor: theme.palette.primary.main + '!important',
       color: theme.palette.primary.contrastText,
     }
   },
@@ -160,7 +160,7 @@ function SelectAllHeaderRenderer({isCellSelected}) {
   }, [isRowSelected]);
 
   return <div ref={cellRef} style={{width: '100%', height: '100%'}} onClick={onClick}
-    tabIndex="-1" onKeyDown={(e)=>dataGridExtras.handleShortcuts(e, true)}></div>;
+    tabIndex="0" onKeyDown={(e)=>dataGridExtras.handleShortcuts(e, true)}></div>;
 }
 SelectAllHeaderRenderer.propTypes = {
   isCellSelected: PropTypes.bool,