diff --git a/server/executor.py b/server/executor.py
index bf7302d..4586c5c 100644
--- a/server/executor.py
+++ b/server/executor.py
@@ -47,7 +47,7 @@ class Executor:
                 return self.currentDirectory
         else:
             dirName = self.sanitizeDirectory(dirName)
-            joinedDir = os.path.join(self.currentDirectory, dirName)
+            joinedDir = os.path.join(self.baseDir, self.currentDirectory, dirName)
             if os.path.exists(joinedDir):
                 self.currentDirectory = joinedDir
             return self.currentDirectory