diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 36fc76ec3..e1660b53d 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -948,8 +948,6 @@ define('pgadmin.browser.node', [
 
       // Callback to show object properties
       let properties = function() {
-          /* Remove any dom rendered by getNodeView */
-          removeNodeView(j[0]);
           let treeNodeInfo = pgBrowser.tree.getTreeNodeHierarchy(item);
           getNodeView(
             that.type, treeNodeInfo, 'properties', data, 'tab', j[0], this, onEdit
diff --git a/web/pgadmin/browser/static/js/node_view.jsx b/web/pgadmin/browser/static/js/node_view.jsx
index 666775aac..455ccf787 100644
--- a/web/pgadmin/browser/static/js/node_view.jsx
+++ b/web/pgadmin/browser/static/js/node_view.jsx
@@ -223,6 +223,7 @@ export function getNodeView(nodeType, treeNodeInfo, actionType, itemNodeData, fo
         getSQLValue={getSQLValue}
         disableSqlHelp={nodeObj.sqlAlterHelp == '' && nodeObj.sqlCreateHelp == '' && !nodeObj.epasHelp}
         disableDialogHelp={nodeObj.dialogHelp == undefined || nodeObj.dialogHelp == ''}
+        itemNodeData={itemNodeData}
       />
     </Theme>, container);
 }
diff --git a/web/pgadmin/static/js/SchemaView/index.jsx b/web/pgadmin/static/js/SchemaView/index.jsx
index d7e51cadf..da4ca7d25 100644
--- a/web/pgadmin/static/js/SchemaView/index.jsx
+++ b/web/pgadmin/static/js/SchemaView/index.jsx
@@ -866,7 +866,7 @@ const usePropsStyles = makeStyles((theme)=>({
 
 /* If its the properties tab */
 function SchemaPropertiesView({
-  getInitData, viewHelperProps, schema={}, ...props}) {
+  getInitData, viewHelperProps, schema={}, itemNodeData, ...props}) {
   const classes = usePropsStyles();
   let defaultTab = 'General';
   let tabs = {};
@@ -888,7 +888,7 @@ function SchemaPropertiesView({
     }).catch(()=>{
       setLoaderText('');
     });
-  }, [getInitData]);
+  }, [itemNodeData]);
 
 
   /* A simple loop to get all the controls for the fields */
@@ -1020,6 +1020,7 @@ SchemaPropertiesView.propTypes = {
   onHelp: PropTypes.func,
   disableSqlHelp: PropTypes.bool,
   onEdit: PropTypes.func,
+  itemNodeData: PropTypes.object
 };
 
 export default function SchemaView({formType, ...props}) {