diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 8dbf9b1bfc..bba3610ad9 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2624,7 +2624,11 @@ string Buffer::absFileName() const
 
 string Buffer::filePath() const
 {
-	return d->filename.onlyPath().absFileName() + "/";
+	int last = d->filename.onlyPath().absFileName().length() - 1;
+
+	return d->filename.onlyPath().absFileName()[last] == '/'
+		? d->filename.onlyPath().absFileName()
+		: d->filename.onlyPath().absFileName() + "/";
 }
 
 
diff --git a/status.20x b/status.20x
index 1f52e2f8f8..3bcbb8bb22 100644
--- a/status.20x
+++ b/status.20x
@@ -130,6 +130,9 @@ What's new
 
 - Fixed an infinite loop when pasting '\\ ' into math (bug 8089).
 
+- Fixed problem when setting working directory on Windows to root of a
+  disk, e.g., C:\ (bug 7982).
+
 - Don't reset the selected format each time we click into a new paragraph
   in View->Source (bug 7997).