diff --git a/server/executor.py b/server/executor.py
index 3543157..55e5817 100644
--- a/server/executor.py
+++ b/server/executor.py
@@ -39,8 +39,11 @@ class Executor:
             p = Path(os.path.join(self.baseDir, self.currentDirectory))
             parentpath = p.parent
             if (str(parentpath) + os.path.sep)== self.baseDir:
+                self.currentDirectory = ""
                 return self.currentDirectory
             else:
+                if len(str(parentpath).split('/')) < len(self.baseDir.split('/')):
+                    return self.currentDirectory
                 newpath = str(parentpath).replace(self.baseDir,'')
                 if os.path.exists(os.path.join(self.baseDir,newpath)):
                     self.currentDirectory = newpath