diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 4f6600b7b..1e86e94bf 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -91,10 +91,9 @@ void RaceResultGUI::enableAllButtons()
     {
         // In case of a GP:
         // ----------------
-        top->setText( _("Continue") );
-        top->setVisible(true);
+        top->setVisible(false);
 
-        middle->setText( _("Restart") );
+        middle->setText( _("Continue") );
         middle->setVisible(true);
 
         bottom->setText( _("Abort Grand Prix") );
@@ -154,17 +153,14 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
     // -----------------
     if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
     {
-        StateManager::get()->popMenu();
-        if(name=="top")                 // Next GP
+        if (name == "middle")        // Next GP
         {
+            StateManager::get()->popMenu();
             race_manager->next();
         }
-        else if (name=="middle")        // Restart
-        {
-            race_manager->rerunRace();
-        }
-        else if (name=="bottom")        // Abort
+        else if (name == "bottom")        // Abort
         {
+            StateManager::get()->popMenu();
             race_manager->exitRace();
             StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
         }