diff --git a/web/pgadmin/misc/file_manager/static/js/components/FileManager.jsx b/web/pgadmin/misc/file_manager/static/js/components/FileManager.jsx
index f764c6925..7119c1df6 100644
--- a/web/pgadmin/misc/file_manager/static/js/components/FileManager.jsx
+++ b/web/pgadmin/misc/file_manager/static/js/components/FileManager.jsx
@@ -305,14 +305,18 @@ export class FileManagerUtils {
   }
 
   async checkPermission(path) {
-    let res = await this.api.post(this.fileConnectorUrl, {
-      'path': path,
-      'mode': 'permission',
-    });
-    if (res.data.data.result.Code === 1) {
-      return null;
-    } else {
-      return res.data.data.result.Error;
+    try {
+      let res = await this.api.post(this.fileConnectorUrl, {
+        'path': path,
+        'mode': 'permission',
+      });
+      if (res.data.data.result.Code === 1) {
+        return null;
+      } else {
+        return res.data.data.result.Error;
+      }
+    } catch (error) {
+      return parseApiError(error);
     }
   }
 
diff --git a/web/pgadmin/static/js/components/Menu.jsx b/web/pgadmin/static/js/components/Menu.jsx
index e7435f385..6d23c3b5b 100644
--- a/web/pgadmin/static/js/components/Menu.jsx
+++ b/web/pgadmin/static/js/components/Menu.jsx
@@ -72,7 +72,6 @@ export function PgMenu({open, className='', label, menuButton=null, ...props}) {
     <ControlledMenu
       state={state}
       {...props}
-      portal
       className={clsx(classes.menu, className)}
       aria-label={label || 'Menu'}
       data-state={state}
diff --git a/web/pgadmin/static/js/tree/tree_init.tsx b/web/pgadmin/static/js/tree/tree_init.tsx
index 64322a807..69c31a29b 100644
--- a/web/pgadmin/static/js/tree/tree_init.tsx
+++ b/web/pgadmin/static/js/tree/tree_init.tsx
@@ -147,6 +147,7 @@ function BrowserTree(props) {
           open={Boolean(contextPos) && contextMenuItems.length !=0}
           onClose={()=>setContextPos(null)}
           label="context"
+          portal
       >
         {contextMenuItems.length !=0 && contextMenuItems.map((menuItem, i)=>{
             const submenus = menuItem.getMenuItems();
diff --git a/web/pgadmin/tools/import_export_servers/__init__.py b/web/pgadmin/tools/import_export_servers/__init__.py
index 91ec2ac62..3aad71007 100644
--- a/web/pgadmin/tools/import_export_servers/__init__.py
+++ b/web/pgadmin/tools/import_export_servers/__init__.py
@@ -127,13 +127,6 @@ def load_servers():
     except Exception as e:
         return bad_request(errormsg=str(e))
 
-    if storage_manager_path:
-        # generate full path of file
-        file_path = os.path.join(
-            storage_manager_path,
-            file_path.lstrip('/').lstrip('\\')
-        )
-
     if file_path and os.path.exists(file_path):
         try:
             with open(file_path, 'r') as j: