diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index 232411a3..e123546e 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -305,7 +305,9 @@ namespace Vocaluxe.PartyModes
             if (TeamNr >= _ScreenSongOptions.Selection.NumJokers.Length)
                 return;
 
-            _ScreenSongOptions.Selection.NumJokers[TeamNr]--;
+            if (_ScreenSongOptions.Selection.RandomOnly)
+                _ScreenSongOptions.Selection.NumJokers[TeamNr]--;
+
             _ScreenSongOptions.Selection.RandomOnly = true;
             _ScreenSongOptions.Selection.CategoryChangeAllowed = false;
 
diff --git a/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModeChallenge/PartyScreenChallengeNames.cs
index 975eaa02..21fc56b7 100644
--- a/PartyModeChallenge/PartyScreenChallengeNames.cs
+++ b/PartyModeChallenge/PartyScreenChallengeNames.cs
@@ -130,8 +130,8 @@ namespace Vocaluxe.PartyModes
                             if (Buttons[htButtons(ButtonNext)].Selected)
                                 Next();
 
-                            OnAdd();
-                            OnRemove();
+                            if (!OnAdd())
+                                OnRemove();
                             break;
 
                         case Keys.Delete:
@@ -237,12 +237,13 @@ namespace Vocaluxe.PartyModes
                 if (Buttons[htButtons(ButtonNext)].Selected)
                     Next();
 
-                OnAdd();
+                if (!OnAdd())
+                    OnRemove();
             }
 
-            if (MouseEvent.RB && IsMouseOver(MouseEvent))
+            if (MouseEvent.RB)
             {
-                OnRemove();
+                Back();
             }
 
             return true;
@@ -452,7 +453,7 @@ namespace Vocaluxe.PartyModes
                 Buttons[htButtons(ButtonNext)].Visible = false;
         }
 
-        private void OnAdd()
+        private bool OnAdd()
         {
             for (int i = 0; i < PlayerChooseButtons.Count; i++)
             {
@@ -473,12 +474,14 @@ namespace Vocaluxe.PartyModes
                         //Update Tiles-List
                         UpdateButtonPlayerChoose();
                         CheckInteraction();
+                        return true;
                     }
                 }
             }
+            return false;
         }
 
-        private void OnRemove()
+        private bool OnRemove()
         {
             for (int i = 0; i < PlayerDestinationButtons.Count; i++)
             {
@@ -491,9 +494,11 @@ namespace Vocaluxe.PartyModes
                         UpdateButtonPlayerDestination();
                         UpdateButtonPlayerChoose();
                         CheckInteraction();
+                        return true;
                     }
                 }
             }
+            return false;
         }
 
         private void Back()