diff --git a/common/path.cpp b/common/path.cpp
index 7adad9b59b1..8638f0c8772 100644
--- a/common/path.cpp
+++ b/common/path.cpp
@@ -396,6 +396,9 @@ String Path::baseName() const {
 
 	if (separatorPos != String::npos) {
 		begin += separatorPos + 1;
+	} else if (isEscaped()) {
+		// unescape uses the real start, not the escape marker
+		begin++;
 	}
 	end += last;
 
diff --git a/test/common/path.h b/test/common/path.h
index cfddeced759..e2c44421602 100644
--- a/test/common/path.h
+++ b/test/common/path.h
@@ -89,6 +89,9 @@ class PathTestSuite : public CxxTest::TestSuite
 
 		Common::Path p4("parent/dir/file.txt/");
 		TS_ASSERT_EQUALS(p4.baseName(), "file.txt");
+
+		Common::Path p5("File I/O", ':');
+		TS_ASSERT_EQUALS(p5.baseName(), "File I/O");
 	}
 
 	void test_getParent() {