diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java
index 162c228a3..5067c2a56 100644
--- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java
+++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java
@@ -73,7 +73,8 @@ public class SceneComposerToolController extends SceneToolController {
     @Override
     public void cleanup() {
         super.cleanup();
-        SceneApplication.getApplication().getRenderManager().removeMainView(overlayView);
+        //SceneApplication.getApplication().getRenderManager().removeMainView(overlayView);
+        overlayView.detachScene(onTopToolsNode);
         cameraController = null;
         editorController = null;
         onTopToolsNode.detachAllChildren();