diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index f88fb6584..e1e025f9b 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -1267,7 +1267,8 @@ define('pgadmin.browser', [
             var _parent = this.t.parent(this.i) || null;
 
             // If there is no parent then just update the node
-            if(_parent && _parent.length == 0 && ctx.op == 'UPDATE') {
+            if(this.t.isRootNode(_parent) ||
+             (_parent && _parent.length == 0 && ctx.op == 'UPDATE')) {
               updateNode();
             } else {
               var postRemove = function() {
diff --git a/web/pgadmin/static/js/tree/tree.js b/web/pgadmin/static/js/tree/tree.js
index 05582cee9..3ca4ee533 100644
--- a/web/pgadmin/static/js/tree/tree.js
+++ b/web/pgadmin/static/js/tree/tree.js
@@ -205,11 +205,11 @@ export class Tree {
 
   first(item) {
     const model = this.tree.getModel();
-    if (item === undefined || item === null) {
+    if ((item === undefined || item === null) && model.root.children !== null) {
       return model.root.children[0];
     }
 
-    if (item.branchSize > 0) {
+    if (item !== undefined && item !== null && item.branchSize > 0) {
       return item.children[0];
     }
 
@@ -285,6 +285,11 @@ export class Tree {
     return (item !== undefined && item.getMetadata('data') !== undefined) ? item._metadata.data : [];
   }
 
+  isRootNode(item) {
+    const model = this.tree.getModel();
+    return item === model.root;
+  }
+
   isInode(item) {
     const children = this.children(item);
     if (children === null || children === undefined) return false;