diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3267421..af62efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 
 ## Unreleased
+- Fixed heat loop assignment in the editor so the selected loop is applied consistently.
 - Improved performance
   - Color animations no longer update all materials when they haven't changed.
 
diff --git a/Source/Modules/ModuleSystemHeat.cs b/Source/Modules/ModuleSystemHeat.cs
index 600032b..f0cec56 100644
--- a/Source/Modules/ModuleSystemHeat.cs
+++ b/Source/Modules/ModuleSystemHeat.cs
@@ -144,7 +144,13 @@ void SetupUI()
 
     private void ChangeLoop(BaseField field, object oldFieldValueObj)
     {
-      if (!HighLogic.LoadedSceneIsFlight)
+      if (!HighLogic.LoadedSceneIsFlight && !HighLogic.LoadedSceneIsEditor)
+        return;
+
+      if (simulator == null)
+        FindSimulator();
+
+      if (simulator == null)
         return;
 
       var oldLoopID = (int)oldFieldValueObj;