1) Newly added server/server group is not visible in the tree unless pgAdmin is refreshed. Fixes #6839

2) Internal server error displayed if disconnect the server. Fixes #6852

web/pgadmin/browser/static/js/browser.js

@@ -469,6 +469,7 @@ define('pgadmin.browser', [
             $div = $('<div></div>'),
             context_menu = {};
 
+          if(item) obj.tree.select(item);
           pgAdmin.Browser.MenuCreator(
             obj.Nodes, $div, menus, obj.menu_categories, d, item, context_menu
           );
@@ -1095,7 +1096,6 @@ define('pgadmin.browser', [
               } else {
                 var _append = function() {
                   var ___ctx = this,
-                    is_parent_loaded_before = ___ctx.t.wasLoad(___ctx.i),
                     _parent_data = ___ctx.t.itemData(___ctx.i);
 
                   ___ctx.t.append(___ctx.i, _data).then(
@@ -1103,7 +1103,7 @@ define('pgadmin.browser', [
                       // Open the item path only if its parent is loaded
                       // or parent type is same as nodes
                       if(
-                        is_parent_loaded_before &&
+                        ___ctx.t.wasLoad(___ctx.i) &&
                           _parent_data &&  _parent_data._type.search(
                           _data._type
                         ) > -1

web/pgadmin/static/js/tree/tree.js

@@ -140,12 +140,12 @@ export class Tree {
     await this.tree.toggleDirectory(item);
   }
 
-  async select(item) {
-    await this.tree.setActiveFile(item);
+  async select(item, ensureVisible=false) {
+    await this.tree.setActiveFile(item, ensureVisible);
   }
 
-  async selectNode(item) {
-    this.tree.setActiveFile(item);
+  async selectNode(item, ensureVisible=false) {
+    this.tree.setActiveFile(item, ensureVisible);
   }
 
   async unload(item) {
@@ -194,7 +194,7 @@ export class Tree {
 
   wasLoad(item) {
     if (item && item.type === FileType.Directory) {
-      return item.isExpanded;
+      return item.isExpanded && item.children != null && item.children.length > 0;
     }
     return true;
   }
@@ -270,7 +270,7 @@ export class Tree {
   }
 
   itemData(item) {
-    return (item !== undefined && item.getMetadata('data') !== undefined) ? item._metadata.data : [];
+    return (item !== undefined && item !== null  && item.getMetadata('data') !== undefined) ? item._metadata.data : [];
   }
 
   getData(item) {

web/pgadmin/static/js/tree/tree_init.tsx

@@ -76,7 +76,7 @@ var initBrowserTree = async (pgBrowser) => {
   // Render Browser Tree
   await render(
     <div>
-      <FileTreeX height={999} width={'100%'} model={treeModelX}
+      <FileTreeX height={950} width={'100%'} model={treeModelX}
         onReady={itemHandle} create={create} remove={remove} update={update}/>
      </div>, document.getElementById('tree'));
 }

web/pgadmin/static/scss/_pgadmin4-tree.overrides.scss

@@ -54,7 +54,7 @@
         font-size: 18px;
         text-align: center;
         height: 21px !important;
-        width: 20px;
+        width: 20px !important;
         &:before {
             height: inherit;
             width: inherit;