diff --git a/data/gui/feature_unlocked.stkgui b/data/gui/feature_unlocked.stkgui
index af7959a58..70b49979f 100644
--- a/data/gui/feature_unlocked.stkgui
+++ b/data/gui/feature_unlocked.stkgui
@@ -1,5 +1,5 @@
 <stkgui>
 
-    <button id="back" x="20" y="-40" width="250" height="35" align="left" text="Continue"/>
+    <button id="continue" x="20" y="-40" width="250" height="35" align="left" text="Continue"/>
 
 </stkgui>
\ No newline at end of file
diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp
index b7d0176db..65c401e61 100644
--- a/src/states_screens/feature_unlocked.cpp
+++ b/src/states_screens/feature_unlocked.cpp
@@ -154,9 +154,6 @@ void FeatureUnlockedCutScene::tearDown()
         irr_driver->removeNode(m_root_gift_node);
         m_root_gift_node = NULL;
     }
-    
-    // this is called maybe in the middle of a GP, so ask the race manager to continue
-    race_manager->next();
 }
 
 // -------------------------------------------------------------------------------------
@@ -264,7 +261,7 @@ void FeatureUnlockedCutScene::eventCallback(GUIEngine::Widget* widget,
         if (race_manager->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
         {
             // in GP mode, continue GP after viewing this screen (TODO: test)
-            World::getWorld()->unpause();
+            StateManager::get()->popMenu();
             race_manager->next();
         }
         else