diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index 56dc43e4..76e5dbe7 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -345,6 +345,7 @@ namespace Vocaluxe.PartyModes
 
         public override void LeavingHighscore()
         {
+            //TODO:
             _Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
         }
 
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index e88dec81..2aaf77ba 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -181,6 +181,16 @@ namespace Vocaluxe.Base
         {
             _CurrentPartyMode.PartyMode.FinishedSinging();
         }
+
+        public static void LeavingScore()
+        {
+            _CurrentPartyMode.PartyMode.LeavingScore();
+        }
+
+        public static void LeavingHighscore()
+        {
+            _CurrentPartyMode.PartyMode.LeavingHighscore();
+        }
         #endregion Interface
 
         #region private stuff
diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs
index aeeb0da9..a8551bb7 100644
--- a/Vocaluxe/Screens/CScreenHighscore.cs
+++ b/Vocaluxe/Screens/CScreenHighscore.cs
@@ -89,11 +89,8 @@ namespace Vocaluxe.Screens
                 {
                     case Keys.Escape:
                     case Keys.Back:
-                        CGraphics.FadeTo(EScreens.ScreenSong);
-                        break;
-
                     case Keys.Enter:
-                        CGraphics.FadeTo(EScreens.ScreenSong);
+                        LeaveScreen();
                         break;
 
                     case Keys.Down:
@@ -126,12 +123,12 @@ namespace Vocaluxe.Screens
 
             if (MouseEvent.LB)
             {
-                CGraphics.FadeTo(EScreens.ScreenSong);
+                LeaveScreen();
             }
 
             if (MouseEvent.RB)
             {
-                CGraphics.FadeTo(EScreens.ScreenSong);
+                LeaveScreen();
             }
 
             if (MouseEvent.MB)
@@ -332,5 +329,10 @@ namespace Vocaluxe.Screens
                 _Round = 0;
             UpdateRound();
         }
+
+        private void LeaveScreen()
+        {
+            CParty.LeavingHighscore();
+        }
     }
 }
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index f2f800be..7f757743 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -68,11 +68,8 @@ namespace Vocaluxe.Screens
                 {
                     case Keys.Escape:
                     case Keys.Back:
-                        CGraphics.FadeTo(EScreens.ScreenHighscore);
-                        break;
-
                     case Keys.Enter:
-                        CGraphics.FadeTo(EScreens.ScreenHighscore);
+                        LeaveScreen();
                         break;
 
                     case Keys.Left:
@@ -98,12 +95,12 @@ namespace Vocaluxe.Screens
 
             if (MouseEvent.LB)
             {
-                CGraphics.FadeTo(EScreens.ScreenHighscore);
+                LeaveScreen();
             }
 
             if (MouseEvent.RB)
             {
-                CGraphics.FadeTo(EScreens.ScreenHighscore);
+                LeaveScreen();
             }
 
             return true;
@@ -389,5 +386,10 @@ namespace Vocaluxe.Screens
                 UpdateRatings();
             }
         }
+
+        private void LeaveScreen()
+        {
+            CParty.LeavingScore();
+        }
     }
 }
\ No newline at end of file