2 files changed, 8 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 1fb7bff8..bf479c41 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -1170,7 +1170,10 @@ begin
   ResetSingTemp;
 
   try
-    Error := not CurrentSong.LoadSong();
+  //Check if File is XML
+   if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
+    then Error := not CurrentSong.LoadXMLSong()
+    else Error := not CurrentSong.LoadSong();
   except
     Error := True;
   end;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index d75a3171..859aeb52 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -462,7 +462,10 @@ begin
 
   // FIXME: bad style, put the try-except into LoadSong() and not here
   try
-    success := CurrentSong.LoadSong();
+  //Check if File is XML
+  if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
+   then success := CurrentSong.LoadXMLSong()
+   else success := CurrentSong.LoadSong();
   except
     success := false;
   end;