diff --git a/Changelog b/Changelog
index c08d34790..7127d04a0 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@
     - BUGFIX: Fix minor issues in torrent creation tool
     - BUGFIX: Use checkable actions to avoid issues on systems hiding menu icons (e.g. recent Gnome)
     - BUGFIX: Use busy cursor for search plugin updates
+    - BUGFIX: Free disk space calculation now works if destination folder does not exist
     - COSMETIC: Display "Alternative speed limits" button as pressed when enabled
 
 * Sun Jun 13 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.9
diff --git a/src/misc.cpp b/src/misc.cpp
index 79a0c4167..20175cade 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -134,9 +134,15 @@ QString misc::QDesktopServicesCacheLocation() {
 
 long long misc::freeDiskSpaceOnPath(QString path) {
   if(path.isEmpty()) return -1;
+  path = path.replace("\\", "/");
   QDir dir_path(path);
   if(!dir_path.exists()) {
-    if(!dir_path.cdUp()) return -1;
+    QStringList parts = path.split("/");
+    while (parts.size() > 1 && !QDir(parts.join("/")).exists()) {
+      parts.removeLast();
+    }
+    dir_path = QDir(parts.join("/"));
+    if(!dir_path.exists()) return -1;
   }
   Q_ASSERT(dir_path.exists());
 #ifndef Q_WS_WIN