diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index 4aacf78c..77c2126f 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -88,6 +88,7 @@ namespace Vocaluxe.PartyModes
     public struct FromScreenMain
     {
         public bool FadeToSongSelection;
+        public bool FadeToNameSelection;
     }
     #endregion FromScreen
     #endregion Communication
@@ -226,6 +227,8 @@ namespace Vocaluxe.PartyModes
                         data = (DataFromScreen)Data;
                         if (data.ScreenMain.FadeToSongSelection)
                             _Stage = EStage.Singing;
+                        if (data.ScreenMain.FadeToNameSelection)
+                            _Stage = EStage.Config;
                     }
                     catch (Exception e)
                     {
@@ -235,6 +238,8 @@ namespace Vocaluxe.PartyModes
 
                     if (_Stage == EStage.Singing)
                         StartNextRound();
+                    if (_Stage == EStage.Config)
+                        _Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
                     break;
 
                 default: