diff --git a/src/states_screens/dialogs/enter_gp_name_dialog.cpp b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
index e75c64abc..7d68bf09b 100644
--- a/src/states_screens/dialogs/enter_gp_name_dialog.cpp
+++ b/src/states_screens/dialogs/enter_gp_name_dialog.cpp
@@ -84,17 +84,13 @@ void EnterGPNameDialog::onEnterPressedInternal()
     if (name.size() > 0 && name != "Random Grand Prix")
     {
         // check for duplicate names
-        for (unsigned int i = 0; i < grand_prix_manager->getNumberOfGrandPrix(); i++)
+        if (grand_prix_manager->existsName(name))
         {
-            const GrandPrixData* gp = grand_prix_manager->getGrandPrix(i);
-            if (gp->getName() == name)
-            {
-                LabelWidget* label = getWidget<LabelWidget>("title");
-                assert(label != NULL);
-                label->setText(_("Another grand prix with this name already exists."), false);
-                sfx_manager->quickSound("anvil");
-                return;
-            }
+            LabelWidget* label = getWidget<LabelWidget>("title");
+            assert(label != NULL);
+            label->setText(_("Another grand prix with this name already exists."), false);
+            sfx_manager->quickSound("anvil");
+            return;
         }
 
         // It's unsafe to delete from inside the event handler so we do it
diff --git a/src/states_screens/grand_prix_cutscene.cpp b/src/states_screens/grand_prix_cutscene.cpp
index 533ac78d3..b4032adf2 100644
--- a/src/states_screens/grand_prix_cutscene.cpp
+++ b/src/states_screens/grand_prix_cutscene.cpp
@@ -18,23 +18,47 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "modes/cutscene_world.hpp"
+#include "race/grand_prix_data.hpp"
+#include "race/grand_prix_manager.hpp"
+#include "race/race_manager.hpp"
 #include "states_screens/grand_prix_cutscene.hpp"
+#include "tracks/track_manager.hpp"
+
+#include <string>
+#include <vector>
 
 typedef GUIEngine::ButtonWidget Button;
 
-/** A Button to save the GP if it was a random one */
+/** A Button to save the GP if it was a random GP */
 void GrandPrixCutscene::saveGPButton()
 {
-    #ifdef IMPLEMENTATION_FINISHED
     if (race_manager->getGrandPrix().getId() != "random")
         getWidget<Button>("save")->setVisible(false);
-    #else
-    getWidget<Button>("save")->setVisible(false);
-    #endif
 }   // saveGPButton
 
 // ----------------------------------------------------------------------------
 
+/** \brief Creates a new GP with the same content as the current and saves it
+ *  The GP that the race_manager provides can't be used because we need some
+ *  functions and settings that the GP manager only gives us through
+ *  createNewGP(). */
+void GrandPrixCutscene::onNewGPWithName(const irr::core::stringw& name)
+{
+    // Create a new gp with the corre
+    GrandPrixData* gp = grand_prix_manager->createNewGP(name);
+    const GrandPrixData current_gp = race_manager->getGrandPrix();
+    std::vector<std::string> tracks  = current_gp.getTrackNames();
+    std::vector<int>         laps    = current_gp.getLaps();
+    std::vector<bool>        reverse = current_gp.getReverse();
+    for (unsigned int i = 0; i < laps.size(); i++)
+        gp->addTrack(track_manager->getTrack(tracks[i]), laps[i], reverse[i]);
+    gp->writeToFile();
+
+    // Avoid double-save
+    getWidget<Button>("save")->setVisible(false);
+}   // onNewGPWithName
+
+// ----------------------------------------------------------------------------
 
 void GrandPrixCutscene::eventCallback(GUIEngine::Widget* widget,
                                       const std::string& name,
@@ -44,8 +68,9 @@ void GrandPrixCutscene::eventCallback(GUIEngine::Widget* widget,
     {
         ((CutsceneWorld*)World::getWorld())->abortCutscene();
     }
-    else if (name == "save_gp")
+    else if (name == "save")
     {
+        new EnterGPNameDialog(this, 0.5f, 0.4f);
     }
 }   // eventCallback
 
diff --git a/src/states_screens/grand_prix_cutscene.hpp b/src/states_screens/grand_prix_cutscene.hpp
index 8abeb9289..d85834b7b 100644
--- a/src/states_screens/grand_prix_cutscene.hpp
+++ b/src/states_screens/grand_prix_cutscene.hpp
@@ -21,10 +21,12 @@
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "race/race_manager.hpp"
+#include "states_screens/dialogs/enter_gp_name_dialog.hpp"
 
 #include <string>
 
-class GrandPrixCutscene: public GUIEngine::CutsceneScreen
+class GrandPrixCutscene: public GUIEngine::CutsceneScreen,
+                         public EnterGPNameDialog::INewGPListener
 {
     friend class GUIEngine::ScreenSingleton<GrandPrixCutscene>;
 public:
@@ -32,6 +34,9 @@ public:
 protected:
     void saveGPButton();
 
+    /** implement callback from INewGPListener */
+    void onNewGPWithName(const irr::core::stringw& name);
+
     // implement callbacks from parent class GUIEngine::Screen
     void eventCallback(GUIEngine::Widget* widget,
                        const std::string& name,
diff --git a/src/states_screens/grand_prix_editor_screen.hpp b/src/states_screens/grand_prix_editor_screen.hpp
index 4d763846b..318acf0c0 100644
--- a/src/states_screens/grand_prix_editor_screen.hpp
+++ b/src/states_screens/grand_prix_editor_screen.hpp
@@ -18,8 +18,8 @@
 #ifndef HEADER_GRAND_PRIX_EDITOR_SCREEN_HPP
 #define HEADER_GRAND_PRIX_EDITOR_SCREEN_HPP
 
-#include "dialogs/enter_gp_name_dialog.hpp"
 #include "guiengine/screen.hpp"
+#include "states_screens/dialogs/enter_gp_name_dialog.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"