diff --git a/server/src/data/templates/index.html b/server/src/data/templates/index.html
index fb7ad98..f614dac 100644
--- a/server/src/data/templates/index.html
+++ b/server/src/data/templates/index.html
@@ -189,8 +189,20 @@ document.querySelectorAll('.edit-btn').forEach(button => {
     document.getElementById('editName').value = name;
     document.getElementById('editNoshutdown').value = noshutdown;
     document.getElementById('editTime').value = time;
+    const timeSelect = document.getElementById('editTime');
+    const noshutdownSelect = document.getElementById('editNoshutdown');
 
-    document.getElementById('editTime').disabled = (noshutdown == "1");
+    timeSelect.disabled = (noshutdown == "1");
+    noshutdownSelect.addEventListener('change', function () {
+    if (this.value == "1") 
+    {
+        timeSelect.disabled = true;
+    }
+    else 
+    {
+        timeSelect.disabled = false;
+    }
+    });
 
   });
 });