diff --git a/CodeWalker/ExploreForm.cs b/CodeWalker/ExploreForm.cs
index 593ec4e97..94db509cd 100644
--- a/CodeWalker/ExploreForm.cs
+++ b/CodeWalker/ExploreForm.cs
@@ -381,7 +381,9 @@ public void ConfigureGame()
             var result = GTAFolder.UpdateGTAFolder(false, false);
             if (result)
             {
-                MessageBox.Show("Please restart CodeWalker to use the new folder.");
+                MessageBox.Show("CodeWalker will now restart.");
+                Application.Restart();
+                Environment.Exit(0);
             }
         }
 
diff --git a/CodeWalker/WorldForm.cs b/CodeWalker/WorldForm.cs
index 8f641ab5b..460f688dd 100644
--- a/CodeWalker/WorldForm.cs
+++ b/CodeWalker/WorldForm.cs
@@ -7029,7 +7029,9 @@ private void ToolsMenuConfigureGame_Click(object sender, EventArgs e)
             var result = GTAFolder.UpdateGTAFolder(false, false);
             if (result)
             {
-                MessageBox.Show("Please restart CodeWalker to use the new folder.");
+                MessageBox.Show("CodeWalker will now restart.");
+                Application.Restart();
+                Environment.Exit(0);
             }
         }