diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
index 5901f54e749..b7db2aad54e 100644
--- a/modules/ovis/src/ovis.cpp
+++ b/modules/ovis/src/ovis.cpp
@@ -411,8 +411,14 @@ class WindowSceneImpl : public WindowScene
                 texMgr.remove(texName, RESOURCEGROUP_NAME);
             }
 
+            RTShader::ShaderGenerator::getSingleton().removeSceneManager(sceneMgr);
             root->destroySceneManager(sceneMgr);
         }
+        else
+        {
+            // we share everything, but the camera
+            sceneMgr->destroyCamera(title);
+        }
 
         if(_app->mainWin == this && (flags & SCENE_SEPARATE))
         {