diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 22133cf4ae5..f5bb5e3fa05 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1471,14 +1471,18 @@ static MSIFOLDER *load_folder( MSIPACKAGE *package, LPCWSTR dir )
 
     if (!tgt_long)
         tgt_long = tgt_short;
-    if (!src_short)
-        src_short = tgt_long;
+	
+    if (!src_short) {
+        src_short = tgt_short;
+        src_long = tgt_long;
+    }
+    
     if (!src_long)
         src_long = src_short;
 
     /* FIXME: use the target short path too */
     folder->TargetDefault = strdupW(tgt_long);
-    folder->SourceShortPath = strdupW(src_long);
+    folder->SourceShortPath = strdupW(src_short);
     folder->SourceLongPath = strdupW(src_long);
     msi_free(p);