diff --git a/apps/templates/home/includes/filtermodal.html b/apps/templates/home/includes/filtermodal.html
index 220a185..ae0242b 100644
--- a/apps/templates/home/includes/filtermodal.html
+++ b/apps/templates/home/includes/filtermodal.html
@@ -16,44 +16,44 @@
                         <div class="col-12">
                             <div class="mb-4">
                                 <label for="filterName" class="form-label">Name</label>
-                                <input type="text" id="filterName" name="filterName" class="form-control rounded-1" tabindex="0">
+                                <input type="text" id="filterName" name="filterName" class="form-control rounded-1" tabindex="1">
                             </div>
                         </div>
                         <div class="col-12">
                             <div class="mb-4">
                                 <label for="filterAlgorithm" class="form-label">Matching Algorithm</label>
-                                <select name="filterAlgorithm" id="filterAlgorithm" class="select-2" data-dropdownparent="#filterFormModal" tabindex="1"></select>
+                                <select name="filterAlgorithm" id="filterAlgorithm" class="select-2" data-dropdownparent="#filterFormModal" tabindex="2"></select>
                             </div>
                         </div>
                         <div class="col-12">
                             <div class="mb-4">
                                 <label for="filterMatch" class="form-label">Matching Pattern</label>
-                                <input type="text" id="filterMatch" name="filterMatch" class="form-control rounded-1" placeholder="" tabindex="2">
+                                <input type="text" id="filterMatch" name="filterMatch" class="form-control rounded-1" placeholder="" tabindex="3">
                             </div>
                         </div>
                         <div class="col-lg-6 pe-lg-4">
                             <div class="form-switch ps-0">
                                 <label for="filterWhitelist" class="form-check-label mb-2">Is Whitelist?</label>
                                 <br>
-                                <input type="checkbox" id="filterWhitelist" name="filterWhitelist" class="form-check-input ms-0 mt-0" tabindex="3">
+                                <input type="checkbox" id="filterWhitelist" name="filterWhitelist" class="form-check-input ms-0 mt-0" tabindex="4">
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
                             <div class="form-switch ps-0">
                                 <label for="filterInsensitive" class="form-check-label mb-2">Case Insensitive?</label>
                                 <br>
-                                <input type="checkbox" id="filterInsensitive" name="filterInsensitive" class="form-check-input ms-0 mt-0" tabindex="4">
+                                <input type="checkbox" id="filterInsensitive" name="filterInsensitive" class="form-check-input ms-0 mt-0" tabindex="5">
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="modal-footer px-4">
-                    <button type="button" id="deleteEditFilter" class="btn btn-danger rounded-1 me-auto ms-0 form-edit">Delete</button>
-                    <button type="submit" class="btn btn-primary rounded-1">
+                    <button type="button" id="deleteEditFilter" class="btn btn-danger rounded-1 me-auto ms-0 form-edit" tabindex="6">Delete</button>
+                    <button type="submit" class="btn btn-primary rounded-1" tabindex="7">
                         <span class="form-create">Create</span>
                         <span class="form-edit">Confirm Edit</span>
                     </button>
-                    <button type="button" class="btn btn-secondary rounded-1 ms-3 me-0" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-secondary rounded-1 ms-3 me-0" data-bs-dismiss="modal" tabindex="8">Cancel</button>
                 </div>
             </form>
         </div>