diff --git a/module/ai/css/common.css b/module/ai/css/common.css
index 6936f815f6..632ae1c0e1 100644
--- a/module/ai/css/common.css
+++ b/module/ai/css/common.css
@@ -22,13 +22,13 @@
     justify-content: center;
     align-items: center;
     background-color: #ffffff;
-    cursor: pointer;
 }
 
 .step > a
 {
     position: relative;
     left: 5px;
+    cursor: pointer;
 }
 
 .step:first-child
@@ -71,12 +71,12 @@
 .step.disabled
 {
     background-color: #ffffff;
-    cursor: not-allowed;
 }
 
 .step.disabled > a
 {
     color: #c4c4c4;
+    cursor: not-allowed;
     pointer-events: none;
 }
 
diff --git a/module/ai/view/promptdesignprogressbar.html.php b/module/ai/view/promptdesignprogressbar.html.php
index 3a73308873..dc3a6ef224 100644
--- a/module/ai/view/promptdesignprogressbar.html.php
+++ b/module/ai/view/promptdesignprogressbar.html.php
@@ -79,6 +79,8 @@
     </div>
   </div>
   <script>
+    let isPromptDesignDirty = false;
+
     (function()
     {
       const steps = document.getElementsByClassName('steps')[0];
@@ -112,11 +114,25 @@
               step.previousElementSibling.lastElementChild.classList.remove('solid-arrow');
             }
           });
+
+          const link = step.querySelector('a');
+          if(!link) continue;
+          link.addEventListener('click', function(e)
+          {
+            if(!isPromptDesignDirty) return;
+            const result = validateForm();
+            if(!result) {
+              e.preventDefault();
+              return;
+            }
+            const submitButton = document.getElementById('saveButton');
+            if(!submitButton) return;
+            submitButton.click();
+          })
         }
       }
     })();
 
-    let isPromptDesignDirty = false;
     (function()
     {
       const backButton = document.querySelector('.design-steps button:first-child');