diff --git a/app/javascript/submission_form/initials_step.vue b/app/javascript/submission_form/initials_step.vue
index 43a5654b..8e1cc1b5 100644
--- a/app/javascript/submission_form/initials_step.vue
+++ b/app/javascript/submission_form/initials_step.vue
@@ -345,7 +345,9 @@ export default {
       if (!this.isDrawInitials) {
         this.$nextTick(() => {
           if (this.$refs.textInput) {
-            this.$refs.textInput.focus()
+            if (!this.submitter.name) {
+              this.$refs.textInput.focus()
+            }
 
             this.initTextInitial()
 
diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue
index c6679ac4..ef5ba45c 100644
--- a/app/javascript/submission_form/signature_step.vue
+++ b/app/javascript/submission_form/signature_step.vue
@@ -674,7 +674,9 @@ export default {
       if (this.isTextSignature) {
         this.$nextTick(() => {
           if (this.$refs.textInput) {
-            this.$refs.textInput.focus()
+            if (!this.submitter.name) {
+              this.$refs.textInput.focus()
+            }
 
             this.initTypedSignature()