diff --git a/data/gui/dialogs/select_challenge.stkgui b/data/gui/dialogs/select_challenge.stkgui
index 455399bf5..540fc9e5d 100644
--- a/data/gui/dialogs/select_challenge.stkgui
+++ b/data/gui/dialogs/select_challenge.stkgui
@@ -24,10 +24,10 @@
         <spacer height="3%" width="1"/>
 
         <buttonbar id="actions" height="20%" width="30%" align="center">
-            <icon-button id="back" icon="gui/icons/back.png"
-                    width="128" height="128" text="Back"/> 
             <icon-button id="start" icon="gui/icons/green_check.png"
                     width="128" height="128" text="Start Race"/>
+            <icon-button id="back" icon="gui/icons/back.png"
+                    width="128" height="128" text="Back"/> 
         </buttonbar>
 
     </div>
diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp
index cffa8eb41..ddad84173 100644
--- a/src/states_screens/dialogs/select_challenge.cpp
+++ b/src/states_screens/dialogs/select_challenge.cpp
@@ -182,8 +182,7 @@ SelectChallengeDialog::SelectChallengeDialog(const float percentWidth,
             track_manager->getTrack(c->getData()->getTrackId())->getName();
         getWidget<LabelWidget>("title")->setText(track_name, true);
     }
-    
-    
+
     
     if (PlayerManager::getCurrentPlayer()->isLocked("difficulty_best"))
     {
@@ -195,6 +194,10 @@ SelectChallengeDialog::SelectChallengeDialog(const float percentWidth,
         getWidget<IconButtonWidget>("supertux")->unsetBadge(LOCKED_BADGE);
         getWidget<IconButtonWidget>("supertux")->setActive(true);
     }
+
+    GUIEngine::RibbonWidget* actions =
+            getWidget<GUIEngine::RibbonWidget>("actions");
+     actions->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
 }
 
 // ----------------------------------------------------------------------------