diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index f17ee63820..a19e5e7e16 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -317,8 +317,15 @@ openspace.fadeOut = function(identifier, fadeTime, endScript)
 
   -- If node is already disabled we don't have to do anything
   if isEnabled then
-    openspace.setPropertyValue(fadeProperty, 0.0, fadeTime, "Linear", endScript)
-    end
+    local disableScript = "openspace.setPropertyValue('" .. enabledProperty .. "', false)"
+    openspace.setPropertyValue(
+      fadeProperty,
+      0.0,
+      fadeTime,
+      "Linear",
+      disableScript .. endScript
+    )
+  end
 end
 
 openspace.toggleFade = function(renderable, fadeTime, endScript)