diff --git a/Source/RP0/Harmony/EditorLogic.cs b/Source/RP0/Harmony/EditorLogic.cs
new file mode 100644
index 00000000000..5f7e053629b
--- /dev/null
+++ b/Source/RP0/Harmony/EditorLogic.cs
@@ -0,0 +1,21 @@
+using HarmonyLib;
+
+namespace RP0.Harmony
+{
+    internal class PatchEditorLogic
+    {
+        [HarmonyPatch(typeof(EditorLogic))]
+        internal class PatchGoForLaunch
+        {
+            [HarmonyPrefix]
+            [HarmonyPatch("goForLaunch")]
+            internal static void Prefix_goForLaunch()
+            {
+                if (PresetManager.Instance.ActivePreset?.GeneralSettings?.Enabled != true) return;
+
+                KerbalConstructionTimeData.Instance.LaunchedVessel = new VesselProject(EditorLogic.fetch.ship, EditorLogic.fetch.launchSiteName, EditorLogic.FlagURL, false);
+                KerbalConstructionTimeData.Instance.LaunchedVessel.LCID = KerbalConstructionTimeData.Instance.ActiveSC.ActiveLC.ID;
+            }
+        }
+    }
+}
diff --git a/Source/RP0/RP0.csproj b/Source/RP0/RP0.csproj
index e29487205de..8b43004299e 100644
--- a/Source/RP0/RP0.csproj
+++ b/Source/RP0/RP0.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Crew\TrainingCourse.cs" />
     <Compile Include="Crew\TrainingTemplate.cs" />
     <Compile Include="Harmony\CrewTransfer.cs" />
+    <Compile Include="Harmony\EditorLogic.cs" />
     <Compile Include="Harmony\KerbalEVA.cs" />
     <Compile Include="Settings\CrewSettings.cs" />
     <Compile Include="Crew\TrainingDatabase.cs" />
@@ -413,4 +414,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/RP0/SpaceCenter/KCTEvents.cs b/Source/RP0/SpaceCenter/KCTEvents.cs
index 5569cf68bb6..71c94488b09 100644
--- a/Source/RP0/SpaceCenter/KCTEvents.cs
+++ b/Source/RP0/SpaceCenter/KCTEvents.cs
@@ -262,7 +262,8 @@ public void VesselSituationChange(GameEvents.HostedFromToAction<Vessel, Vessel.S
         {
             if (ev.from == Vessel.Situations.PRELAUNCH && ev.host == FlightGlobals.ActiveVessel)
             {
-                if (PresetManager.Instance.ActivePreset.GeneralSettings.Enabled)
+                KCT_Preset_General settings = PresetManager.Instance.ActivePreset.GeneralSettings;
+                if (settings.Enabled && settings.BuildTimes)
                 {
                     var dataModule = FlightGlobals.ActiveVessel.vesselModules.Find(vm => vm is KCTVesselTracker) as KCTVesselTracker;
                     if (dataModule != null && dataModule.Data.FacilityBuiltIn == EditorFacility.VAB && !dataModule.Data.HasStartedReconditioning)