diff --git a/lib/core/option.py b/lib/core/option.py
index 530575df0..c29c55e28 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1380,6 +1380,10 @@ def _cleanupOptions():
     else:
         conf.progressWidth = width - 46
 
+    for key, value in conf.items():
+        if value and any(key.endswith(_) for _ in ("Path", "File")):
+            conf[key] = os.path.expanduser(value)
+
     if conf.testParameter:
         conf.testParameter = urldecode(conf.testParameter)
         conf.testParameter = conf.testParameter.replace(" ", "")