diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 3203bd1474..661145da5c 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___OPENSPACEENGINE___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/scene/profile.h>
@@ -137,6 +138,8 @@ private:
     void resetPropertyChangeFlagsOfSubowners(openspace::properties::PropertyOwner* po);
 
     properties::BoolProperty _printEvents;
+    properties::OptionProperty _visibility;
+    properties::BoolProperty _showHiddenSceneGraphNodes;
 
     std::unique_ptr<Scene> _scene;
     std::unique_ptr<AssetManager> _assetManager;
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index eafeef89c6..b812c2b9f6 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -67,19 +67,6 @@ namespace {
         "Gui Scale",
         "GUI scale multiplier."
     };
-
-    constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = {
-        "Visibility",
-        "Visibility",
-        "Hides or displays different settings in the GUI depending on how advanced they "
-        "are."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ShowHiddenSceneInfo = {
-        "ShowHiddenSceneGraphNodes",
-        "Show Hidden Scene Graph Nodes",
-        "If checked, hidden scene graph nodes are visible in the UI"
-    };
 } // namespace
 
 namespace openspace {
@@ -91,23 +78,12 @@ CefWebGuiModule::CefWebGuiModule()
     , _reload(ReloadInfo)
     , _url(GuiUrlInfo, "")
     , _guiScale(GuiScaleInfo, 1.f, 0.1f, 3.f)
-    , _visibility(VisibilityInfo)
-    , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false)
 {
     addProperty(_enabled);
     addProperty(_visible);
     addProperty(_reload);
     addProperty(_url);
     addProperty(_guiScale);
-    addProperty(_visibility);
-    addProperty(_showHiddenSceneGraphNodes);
-
-    using Visibility = openspace::properties::Property::Visibility;
-    _visibility.addOptions({
-    { static_cast<int>(Visibility::User), "User"},
-    { static_cast<int>(Visibility::Developer), "Developer"},
-    { static_cast<int>(Visibility::Hidden), "Everything"},
-        });
 }
 
 void CefWebGuiModule::startOrStopGui() {
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index c8b321755d..8c13339569 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -33,7 +33,6 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/triggerproperty.h>
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/optionproperty.h>
 
 namespace openspace {
 
@@ -54,8 +53,6 @@ private:
     properties::BoolProperty _visible;
     properties::TriggerProperty _reload;
     properties::StringProperty _url;
-    properties::OptionProperty _visibility;
-    properties::BoolProperty _showHiddenSceneGraphNodes;
     properties::FloatProperty _guiScale;
     std::unique_ptr<BrowserInstance> _instance;
 
diff --git a/scripts/developer_settings.lua b/scripts/developer_settings.lua
index 962094f8c1..bb635aa13f 100644
--- a/scripts/developer_settings.lua
+++ b/scripts/developer_settings.lua
@@ -1,4 +1,4 @@
 if(os.getenv("OPENSPACE_DEVELOPER"))
 then
-   openspace.setPropertyValueSingle('Modules.CefWebGui.Visibility', 4)
+   openspace.setPropertyValueSingle('OpenSpaceEngine.Visibility', 4)
 end 
\ No newline at end of file
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 23385d4db6..afe169c746 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -124,6 +124,19 @@ namespace {
         "If this is enabled, all events that are propagated through the system are "
         "printed to the log."
     };
+
+    constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = {
+        "Visibility",
+        "Visibility",
+        "Hides or displays different settings in the GUI depending on how advanced they "
+        "are."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo ShowHiddenSceneInfo = {
+        "ShowHiddenSceneGraphNodes",
+        "Show Hidden Scene Graph Nodes",
+        "If checked, hidden scene graph nodes are visible in the UI"
+    };
 } // namespace
 
 namespace openspace {
@@ -133,6 +146,8 @@ class Scene;
 OpenSpaceEngine::OpenSpaceEngine()
     : properties::PropertyOwner({ "OpenSpaceEngine" })
     , _printEvents(PrintEventsInfo, false)
+    , _visibility(VisibilityInfo)
+    , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false)
 {
     FactoryManager::initialize();
     FactoryManager::ref().addFactory<Renderable>("Renderable");
@@ -149,6 +164,15 @@ OpenSpaceEngine::OpenSpaceEngine()
     TransformationManager::initialize();
 
     addProperty(_printEvents);
+    addProperty(_visibility);
+    addProperty(_showHiddenSceneGraphNodes);
+
+    using Visibility = openspace::properties::Property::Visibility;
+    _visibility.addOptions({
+    { static_cast<int>(Visibility::User), "User"},
+    { static_cast<int>(Visibility::Developer), "Developer"},
+    { static_cast<int>(Visibility::Hidden), "Everything"},
+        });
 }
 
 OpenSpaceEngine::~OpenSpaceEngine() {} // NOLINT