diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index e5d542858..764320a70 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -22,6 +22,7 @@
 
 #include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetoolmode.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 
 #include "editmode.hpp"
 #include "elements.hpp"
@@ -212,6 +213,14 @@ void CSVRender::PagedWorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event
     WorldspaceWidget::mouseDoubleClickEvent(event);
 }
 
+void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons (
+    CSVWidget::SceneToolToggle2 *tool)
+{
+    WorldspaceWidget::addVisibilitySelectorButtons (tool);
+    tool->addButton (Element_Terrain, "Terrain");
+    tool->addButton (Element_Fog, "Fog", "", true);
+}
+
 void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
     CSVWidget::SceneToolMode *tool)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index ca618d122..3db6ee4ed 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -83,6 +83,8 @@ namespace CSVRender
 
         protected:
 
+            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
+
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
 
             virtual void updateOverlay();
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 07acbe493..62cbdf1e1 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -153,6 +153,14 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
+    CSVWidget::SceneToolToggle2 *tool)
+{
+    WorldspaceWidget::addVisibilitySelectorButtons (tool);
+    tool->addButton (Element_Terrain, "Terrain", "", true);
+    tool->addButton (Element_Fog, "Fog");
+}
+
 std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
 {
     Ogre::Vector3 position = getCamera()->getPosition();
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 237cb8f46..d01c3e766 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -60,6 +60,10 @@ namespace CSVRender
 
             virtual std::string getStartupInstruction();
 
+        protected:
+
+            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
+
         private slots:
 
             void cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 1f7c41512..51dfcd506 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -263,10 +263,8 @@ void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
     tool->addButton (Element_Reference, "References");
-    tool->addButton (Element_Terrain, "Terrain");
     tool->addButton (Element_Water, "Water");
     tool->addButton (Element_Pathgrid, "Pathgrid");
-    tool->addButton (Element_Fog, "Fog");
 }
 
 void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 1c5c11a4d..313e519cb 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -72,7 +72,7 @@ void CSVWidget::SceneToolToggle2::showPanel (const QPoint& position)
 }
 
 void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
-    const QString& name, const QString& tooltip)
+    const QString& name, const QString& tooltip, bool disabled)
 {
     std::ostringstream stream;
     stream << mSingleIcon << id;
@@ -84,6 +84,9 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
     button->setIconSize (QSize (mIconSize, mIconSize));
     button->setFixedSize (mButtonSize, mButtonSize);
 
+    if (disabled)
+        button->setDisabled (true);
+
     mLayout->addWidget (button);
 
     ButtonDesc desc;
@@ -95,7 +98,7 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
 
     connect (button, SIGNAL (clicked()), this, SLOT (selected()));
 
-    if (mButtons.size()==1)
+    if (mButtons.size()==1 && !disabled)
         mFirst = button;
 }
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.hpp b/apps/opencs/view/widget/scenetooltoggle2.hpp
index 4bd9ba26f..0bae780f9 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.hpp
@@ -56,7 +56,7 @@ namespace CSVWidget
             /// \attention After the last button has been added, setSelection must be called at
             /// least once to finalise the layout.
             void addButton (unsigned int id,
-                const QString& name, const QString& tooltip = "");
+                const QString& name, const QString& tooltip = "", bool disabled = false);
 
             unsigned int getSelection() const;