diff --git a/src/commands/log.ts b/src/commands/log.ts
index 540e9f8f..6b4b4650 100644
--- a/src/commands/log.ts
+++ b/src/commands/log.ts
@@ -1,4 +1,4 @@
-import * as path from "path";
+import { posix as path } from "path";
 import { commands, Uri, window } from "vscode";
 import { SvnUriAction } from "../common/types";
 import { Repository } from "../repository";
diff --git a/src/commands/openHeadFile.ts b/src/commands/openHeadFile.ts
index 9f5d4b97..456acb15 100644
--- a/src/commands/openHeadFile.ts
+++ b/src/commands/openHeadFile.ts
@@ -1,4 +1,4 @@
-import * as path from "path";
+import { posix as path } from "path";
 import { commands, Uri, window } from "vscode";
 import { Resource } from "../resource";
 import IncomingChangeNode from "../treeView/nodes/incomingChangeNode";
@@ -28,7 +28,7 @@ export class OpenHeadFile extends Command {
 
     const HEAD = await this.getLeftResource(resource, "HEAD");
 
-    const basename = path.basename(resource.resourceUri.fsPath);
+    const basename = path.basename(resource.resourceUri.path);
     if (!HEAD) {
       window.showWarningMessage(
         `"HEAD version of '${basename}' is not available."`
@@ -36,7 +36,7 @@ export class OpenHeadFile extends Command {
       return;
     }
 
-    const basedir = path.dirname(resource.resourceUri.fsPath);
+    const basedir = path.dirname(resource.resourceUri.path);
 
     const uri = HEAD.with({
       path: path.join(basedir, `(HEAD) ${basename}`) // change document title
diff --git a/src/commands/search_log_by_revision.ts b/src/commands/search_log_by_revision.ts
index fddd3244..e59b928c 100644
--- a/src/commands/search_log_by_revision.ts
+++ b/src/commands/search_log_by_revision.ts
@@ -1,4 +1,4 @@
-import * as path from "path";
+import { posix as path } from "path";
 import { Command } from "./command";
 import { window, Uri, commands } from "vscode";
 import { Repository } from "../repository";