diff --git a/apps/templates/home/includes/submodal.html b/apps/templates/home/includes/submodal.html
index 267aece..c098f38 100644
--- a/apps/templates/home/includes/submodal.html
+++ b/apps/templates/home/includes/submodal.html
@@ -89,21 +89,21 @@
                         <div class="col-lg-6 pe-lg-4">
                             <div class="mb-4">
                                 <label for="subTitleMutators" class="form-label">Title Mutators</label>
-                                <select name="subTitleMutators" id="subTitleMutators" class="select-2 sub-mutators-field" multiple data-dropdownparent="#subAdvancedModal" tabindex="6"></select>
+                                <select name="subTitleMutators" id="subTitleMutators" class="select-2 sub-mutators-field" multiple data-dropdownparent="#subAdvancedModal" tabindex="1"></select>
                                 <div class="form-text">Apply mutators to article titles.</div>
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
                             <div class="mb-4">
                                 <label for="subDescMutators" class="form-label">Description Mutators</label>
-                                <select name="subDescMutators" id="subDescMutators" class="select-2 sub-mutators-field" multiple data-dropdownparent="#subAdvancedModal" tabindex="6"></select>
+                                <select name="subDescMutators" id="subDescMutators" class="select-2 sub-mutators-field" multiple data-dropdownparent="#subAdvancedModal" tabindex="2"></select>
                                 <div class="form-text">Apply mutators to article descriptions.</div>
                             </div>
                         </div>
                         <div class="col-lg-6 pe-lg-4 d-none">
                             <div class="mb-4">
                                 <label for="" class="form-label">Article Fetch Limit</label>
-                                <input type="number" id="subFetchLimit" class="form-control rounded-1" max="10" min="1">
+                                <input type="number" id="subFetchLimit" class="form-control rounded-1" max="10" min="1" tabindex="3">
                                 <div class="form-text">Limit the number of articles fetched every cycle.</div>
                             </div>
                         </div>
@@ -111,7 +111,7 @@
                             <div class="form-switch ps-0 mb-4">
                                 <label for="subResetFetchLimit" class="form-check-label mb-2">Max Fetch Limit after the First Cycle</label>
                                 <br>
-                                <input type="checkbox" id="subResetFetchLimit" name="subResetFetchLimit" class="form-check-input ms-0 mt-0" tabindex="6">
+                                <input type="checkbox" id="subResetFetchLimit" name="subResetFetchLimit" class="form-check-input ms-0 mt-0" tabindex="4">
                                 <br>
                                 <div class="form-text">Sets the Fetch Limit to 10 after the first cycle. Helps with initial spam.</div>
                             </div>
@@ -121,14 +121,15 @@
                                 <div class="colour-input"
                                     data-id="subEmbedColour"
                                     data-label="Embed Colour"
-                                    data-helptext="Colour of each embed in Discord.">
+                                    data-helptext="Colour of each embed in Discord."
+                                    data-tabindex="5">
                                 </div>
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
                             <div class="mb-4">
                                 <label for="subPubThreshold" class="form-label">Publish Datetime Threshold</label>
-                                <input type="datetime-local" name="subPubThreshold" id="subPubThreshold" class="form-control">
+                                <input type="datetime-local" name="subPubThreshold" id="subPubThreshold" class="form-control" tabindex="9">
                                 <div class="form-text">RSS content older than this datetime will be skipped.</div>
                             </div>
                         </div>
@@ -136,7 +137,7 @@
                             <div class="form-switch ps-0">
                                 <label for="subArticleFetchImage" class="form-check-label mb-2">Show Images on Embed?</label>
                                 <br>
-                                <input type="checkbox" id="subArticleFetchImage" name="subArticleFetchImage" class="form-check-input ms-0 mt-0" tabindex="6">
+                                <input type="checkbox" id="subArticleFetchImage" name="subArticleFetchImage" class="form-check-input ms-0 mt-0" tabindex="10">
                                 <br>
                                 <div class="form-text">Show images on the discord embed?</div>
                             </div>
@@ -144,7 +145,7 @@
                     </div>
                 </div>
                 <div class="modal-footer px-4">
-                    <button type="button" class="btn btn-primary rounded-1 me-0 ms-3" data-bs-toggle="modal" data-bs-target="#subFormModal">Back</button>                    
+                    <button type="button" class="btn btn-primary rounded-1 me-0 ms-3" data-bs-toggle="modal" data-bs-target="#subFormModal" tabindex="11">Back</button>                    
                 </div>
             </form>
         </div>