diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 0cccde5cfb..4a128d4af6 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -134,8 +134,22 @@ void CSVRender::PagedWorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
     }
 }
 
+void CSVRender::PagedWorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event)
+{
+    if(event->button() == Qt::RightButton)
+    {
+        std::cout << "double clicked" << std::endl;
+    }
+}
+
 void CSVRender::PagedWorldspaceWidget::updateOverlay()
 {
+    // better camera position at the start
+    if(getCamera()->getViewport() && getCamera()->getPosition().z < 1)
+    {
+        getCamera()->move(getCamera()->getDirection() * -6000);
+    }
+
     Ogre::OverlayManager &overlayMgr = Ogre::OverlayManager::getSingleton();
     Ogre::Overlay* overlay = overlayMgr.getByName("CellIDPanel");
     if(overlay && !mTextOverlays.empty())
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index c6c8d8e135..b3f3fb4ef0 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -82,6 +82,8 @@ namespace CSVRender
 
             virtual void mouseReleaseEvent (QMouseEvent *event);
 
+            virtual void mouseDoubleClickEvent (QMouseEvent *event);
+
         signals:
 
             void cellSelectionChanged (const CSMWorld::CellSelection& selection);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index d58ac8ec31..723b5027e3 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -166,8 +166,6 @@ namespace CSVRender
         {
             if (mSceneMgr)
                 mSceneMgr->removeRenderQueueListener (mOverlaySystem);
-
-            delete mOverlaySystem;
         }
 
         if (mSceneMgr)