diff --git a/public/css/world-info.css b/public/css/world-info.css
index 425b4f83b..079d45188 100644
--- a/public/css/world-info.css
+++ b/public/css/world-info.css
@@ -160,3 +160,12 @@
 #world_info_search {
     width: 10em;
 }
+
+.disabledWIEntry {
+    opacity: 0.2;
+    filter: grayscale(1);
+}
+
+.height32px {
+    height: 32px;
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 1fff4b835..adab85518 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3910,7 +3910,13 @@
                         <span class="drag-handle">&#9776;</span>
                         <div class="gap5px world_entry_thin_controls wide100p alignitemscenter">
                             <small>
-                                <span><span class="world_entry_form_position_value"></span>
+                                <span>
+                                    <span class="world_entry_form_position_value"></span>
+                                    <select name="entryStateSelector" class="widthNatural height32px margin0">
+                                        <option value="constant">!</option>
+                                        <option value="normal">O</option>
+                                        <option value="disabled">X</option>
+                                    </select>
                                 </span>
                             </small>
                             <div class="world_entry_form_control flex1">
@@ -3996,6 +4002,7 @@
                         </div>
                         <div name="WIEntryBottomControls" class="flex-container flex1 justifySpaceBetween world_entry_form_horizontal">
                             <div class="flex-container flexFlowColumn flexNoGap  wi-enter-footer-text  ">
+                                <!--
                                 <label class="checkbox flex-container">
                                     <input type="checkbox" name="constant" />
                                     <span data-i18n="Constant">Constant</span>
@@ -4004,6 +4011,7 @@
                                     <input type="checkbox" name="disable" />
                                     <span data-i18n="Disable">Disable</span>
                                 </label>
+                                -->
                                 <label class="checkbox flex-container">
                                     <input type="checkbox" name="selective" />
                                     <span data-i18n="Selective">Selective</span>
@@ -4637,4 +4645,4 @@
     </script>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js
index 20a28f994..298110325 100644
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@@ -451,6 +451,10 @@ function getWorldEntry(name, data, entry) {
     const selectiveLogicDropdown = template.find('select[name="entryLogicType"]');
     selectiveLogicDropdown.data("uid", entry.uid);
 
+    selectiveLogicDropdown.on("click", function (event) {
+        event.stopPropagation();
+    })
+
     selectiveLogicDropdown.on("input", function () {
         const uid = $(this).data("uid");
         const value = Number($(this).val());
@@ -662,6 +666,7 @@ function getWorldEntry(name, data, entry) {
 
 
     // constant
+    /*
     const constantInput = template.find('input[name="constant"]');
     constantInput.data("uid", entry.uid);
     constantInput.on("input", function () {
@@ -672,6 +677,7 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
     constantInput.prop("checked", entry.constant).trigger("input");
+    */
 
     // order
     const orderInput = template.find('input[name="order"]');
@@ -797,6 +803,7 @@ function getWorldEntry(name, data, entry) {
     template.find(".world_entry_form_uid_value").text(`(UID: ${entry.uid})`);
 
     // disable
+    /*     
     const disableInput = template.find('input[name="disable"]');
     disableInput.data("uid", entry.uid);
     disableInput.on("input", function () {
@@ -807,6 +814,70 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
     disableInput.prop("checked", entry.disable).trigger("input");
+    */
+
+    //new tri-state selector for constant/normal/disabled
+    const entryStateSelector = template.find('select[name="entryStateSelector"]');
+    entryStateSelector.data("uid", entry.uid);
+    console.log(entry.uid)
+    entryStateSelector.on("click", function (event) {
+        // Prevent closing the drawer on clicking the input
+        event.stopPropagation();
+    });
+    entryStateSelector.on("input", function () {
+        const uid = entry.uid;
+        const value = $(this).val();
+        switch (value) {
+            case "constant":
+                data.entries[uid].constant = true;
+                data.entries[uid].disable = false;
+                setOriginalDataValue(data, uid, "enabled", true);
+                setOriginalDataValue(data, uid, "constant", true);
+                template.removeClass('disabledWIEntry');
+                console.debug("set to constant")
+                break
+            case "normal":
+                data.entries[uid].constant = false;
+                data.entries[uid].disable = false;
+                setOriginalDataValue(data, uid, "enabled", true);
+                setOriginalDataValue(data, uid, "constant", false);
+                template.removeClass('disabledWIEntry');
+                console.debug("set to normal")
+                break
+            case "disabled":
+                data.entries[uid].constant = false;
+                data.entries[uid].disable = true;
+                setOriginalDataValue(data, uid, "enabled", false);
+                setOriginalDataValue(data, uid, "constant", false);
+                template.addClass('disabledWIEntry');
+                console.debug("set to disabled")
+                break
+        }
+        saveWorldInfo(name, data);
+
+    })
+
+    const entryState = function () {
+
+        console.log(`constant: ${entry.constant},  disabled: ${entry.disable}`)
+        if (entry.constant === true) {
+            console.debug('found constant')
+            return "constant"
+        } else if (entry.disable === true) {
+            console.debug('found disabled')
+            return "disabled"
+        } else {
+            console.debug('found normal')
+            return "normal"
+        }
+
+    }
+    template
+        .find(`select[name="entryStateSelector"] option[value=${entryState()}]`)
+        .prop("selected", true)
+        .trigger("input");
+
+    saveWorldInfo(name, data);
 
     // exclude recursion
     const excludeRecursionInput = template.find('input[name="exclude_recursion"]');
@@ -837,7 +908,6 @@ function getWorldEntry(name, data, entry) {
         // display position/order info left of keyword box
         let entry = data.entries[uid]
         let posText = entry.position
-        console.log(posText)
         switch (entry.position) {
             case 0:
                 posText = '↑CD';