diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 85beab4098..a1be38bb06 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -538,25 +538,13 @@
                 </div>
             <fieldset class="minor">
                 <legend class="sub-section-header zone-group zone-section background-section">
-                    Background
+                    Skybox
                 </legend>
                 <form>
                     <input type="radio" name="skyboxMode" value="inherit" id="property-zone-skybox-mode-inherit" checked> Inherit
                     <input type="radio" name="skyboxMode" value="disabled" id="property-zone-skybox-mode-disabled"> Off
                     <input type="radio" name="skyboxMode" value="enabled" id="property-zone-skybox-mode-enabled"> On
                 </form>
-                <div class="zone-group zone-section background-section property dropdown">
-                    <label>Background mode</label>
-                    <select name="SelectBackgroundMode" id="property-zone-background-mode">
-                        <option value="inherit">Nothing</option>
-                        <option value="skybox">Skybox</option>
-                    </select>
-                </div>
-            </fieldset>
-            <fieldset class="minor skybox-section">
-                <legend class="sub-section-header zone-group zone-section skybox-section">
-                    Skybox
-                </legend>
                 <fieldset class="zone-group zone-section skybox-section property rgb fstuple">
                     <div class="color-picker" id="property-zone-skybox-color"></div>
                     <legend>Skybox color</legend>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 894c4ad47c..da9be64ef0 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -83,6 +83,7 @@ function disableProperties() {
 function showElements(els, show) {
     for (var i = 0; i < els.length; i++) {
         els[i].style.display = (show) ? 'table' : 'none';
+
     }
 }
 
@@ -698,8 +699,6 @@ function loaded() {
         var elZoneStageDay = document.getElementById("property-zone-stage-day");
         var elZoneStageHour = document.getElementById("property-zone-stage-hour");
 
-        var elZoneBackgroundMode = document.getElementById("property-zone-background-mode");
-
         var elZoneSkyboxColor = document.getElementById("property-zone-skybox-color");
         var elZoneSkyboxColorRed = document.getElementById("property-zone-skybox-color-red");
         var elZoneSkyboxColorGreen = document.getElementById("property-zone-skybox-color-green");
@@ -1093,9 +1092,6 @@ function loaded() {
                             elShapeType.value = properties.shapeType;
                             elCompoundShapeURL.value = properties.compoundShapeURL;
 
-                            elZoneBackgroundMode.value = properties.backgroundMode;
-                            setDropdownText(elZoneBackgroundMode);
-
                             elZoneSkyboxColor.style.backgroundColor = "rgb(" + properties.skybox.color.red + "," + 
                                                        properties.skybox.color.green + "," + properties.skybox.color.blue + ")";
                             elZoneSkyboxColorRed.value = properties.skybox.color.red;
@@ -1107,8 +1103,9 @@ function loaded() {
                             elZoneGhostingAllowed.checked = properties.ghostingAllowed;
                             elZoneFilterURL.value = properties.filterURL;
 
+                            // Show/hide sections as required
                             showElements(document.getElementsByClassName('skybox-section'), 
-                                elZoneBackgroundMode.value === 'skybox');
+                                elZoneSkyboxModeEnabled.checked);
                         } else if (properties.type === "PolyVox") {
                             elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2);
                             elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2);
@@ -1479,7 +1476,6 @@ function loaded() {
         elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
 
         // Skybox
-
         var skyboxModeChanged = createZoneComponentModeChangedFunction('skyboxMode',
             elZoneSkyboxModeInherit, elZoneSkyboxModeDisabled, elZoneSkyboxModeEnabled);
 
@@ -1588,8 +1584,6 @@ function loaded() {
         elZoneStageDay.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'day'));
         elZoneStageHour.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'hour'));
 
-        elZoneBackgroundMode.addEventListener('change', createEmitTextPropertyUpdateFunction('backgroundMode'));
-
         var zoneSkyboxColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('skybox', 'color',
             elZoneSkyboxColorRed, elZoneSkyboxColorGreen, elZoneSkyboxColorBlue);
         elZoneSkyboxColorRed.addEventListener('change', zoneSkyboxColorChangeFunction);