diff --git a/bundles/org.dbvr.cli/src/org/dbvr/cli/app/CLIApplicationBase.java b/bundles/org.dbvr.cli/src/org/dbvr/cli/app/CLIApplicationBase.java
index 5c1abae..b9deb58 100644
--- a/bundles/org.dbvr.cli/src/org/dbvr/cli/app/CLIApplicationBase.java
+++ b/bundles/org.dbvr.cli/src/org/dbvr/cli/app/CLIApplicationBase.java
@@ -68,7 +68,7 @@ protected CLIApplicationBase() {
         String workingDirectory = RuntimeUtils.getWorkingDirectory(BasePlatformImpl.DBEAVER_DATA_DIR);
 
         // Workspace dir
-        workspaceDirCurrent = Path.of(workingDirectory, DEFAULT_WORKSPACE_FOLDER);
+        workspaceDirCurrent = RuntimeUtils.getWorkspacePath(workingDirectory, DEFAULT_WORKSPACE_FOLDER);
         Log.setLogHandler(new VoidLogHandler());
     }