diff --git a/apps/static/js/home/filters.js b/apps/static/js/home/filters.js
index 0a356cf..f73b033 100644
--- a/apps/static/js/home/filters.js
+++ b/apps/static/js/home/filters.js
@@ -86,6 +86,8 @@ async function showEditFilterModal(filterId) {
         $("#filterFormModal input, #filterFormModal textarea").val("");
         $("#filterFormModal input:checkbox").prop("checked", false);
 
+        $("#filterAlgorithm").val("").change();
+
         $("#filterFormModal .form-create").show();
         $("#filterFormModal .form-edit").hide();
     }
@@ -94,8 +96,10 @@ async function showEditFilterModal(filterId) {
             return data.id === filterId;
         }).data();
 
+        $("#filterAlgorithm").val("").change();
+        $("#filterAlgorithm").val(filter.matching_algorithm).change();
+
         $("#filterName").val(filter.name);
-        $("#filterAlgorithm").val(filter.matching_algorithm);
         $("#filterMatch").val(filter.match);
         $("#filterWhitelist").prop("checked", filter.is_whitelist);
         $("#filterInsensitive").prop("checked", filter.is_insensitive);
diff --git a/apps/templates/home/includes/filtermodal.html b/apps/templates/home/includes/filtermodal.html
index 920aa9c..220a185 100644
--- a/apps/templates/home/includes/filtermodal.html
+++ b/apps/templates/home/includes/filtermodal.html
@@ -47,13 +47,13 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer">
+                <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">
                         <span class="form-create">Create</span>
                         <span class="form-edit">Confirm Edit</span>
                     </button>
-                    <button type="button" class="btn btn-secondary rounded-1" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-secondary rounded-1 ms-3 me-0" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div>