diff --git a/app/assets/javascripts/validation.js b/app/assets/javascripts/validation.js
index 0f60fc299..ade16c0e3 100644
--- a/app/assets/javascripts/validation.js
+++ b/app/assets/javascripts/validation.js
@@ -38,6 +38,7 @@ function attachValidation() {
             const validatedRadioNames = new Set();
 
             inputs.forEach((input) => {
+                if (input.type === "hidden") return;
                 const errorId = input.type === "radio" ? `${input.name}-error` : `${input.id}-error`;
                 let errorElement = document.getElementById(errorId);
 
@@ -85,6 +86,7 @@ function attachValidation() {
         });
 
         inputs.forEach((input) => {
+            if (input.type === "hidden") return;
             input.addEventListener("input", function () {
                 const errorId = input.type === "radio" ? `${input.name}-error` : `${input.id}-error`;
                 const errorElement = document.getElementById(errorId);
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index fdc15af5d..87dba61e4 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -27,7 +27,7 @@
       {% set content_hint = 'Your service name will be added to the start of your message. You can turn this off in Settings.' %}
     {% endif %}
 
-    {% call form_wrapper() %}
+    {% call form_wrapper(data_force_focus=True) %}
       <div class="grid-container padding-0">
         <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
           {{ form.name(param_extensions={