diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py
index 7040f11..600df55 100644
--- a/web/pgadmin/misc/file_manager/__init__.py
+++ b/web/pgadmin/misc/file_manager/__init__.py
@@ -599,8 +599,8 @@ class Filemanager(object):
         Returns files and folders in give path
         """
         trans_data = Filemanager.get_trasaction_selection(self.trans_id)
-        dir = self.dir if self.dir is not None else ''
-        if not dir.endswith('/'):
+        dir = self.dir
+        if dir is not None and not dir.endswith('/'):
             dir += '/';
 
         filelist = self.list_filesystem(dir, path, trans_data, file_type)