diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index b4dd0035b..553d111f8 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -121,8 +121,8 @@
             data-icon="writing"
           >
             <form
-              target="_blank"
-              data-turbo="false"
+              :target="nativeApp ? null : '_blank'"
+              :data-turbo="nativeApp ? null : 'false'"
               class="inline"
               method="post"
               :action="`/start_form_self/${template.id}`"
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index cd3d60696..ff2f6478b 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -110,7 +110,7 @@
                 </open-modal-mobile>
               <% end %>
               <% if Templates.filter_undefined_submitters(@template.submitters).size == 1 && @template.variables_schema.blank? %>
-                <%= button_to start_form_self_path(@template), method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: '_blank', data: { turbo: false } } do %>
+                <%= button_to start_form_self_path(@template), method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: turbo_native_app? ? nil : '_blank', data: { turbo: turbo_native_app? ? nil : false } } do %>
                   <%= svg_icon('writing', class: 'w-6 h-6') %>
                   <span class="mr-1"><%= t('sign_it_yourself') %></span>
                 <% end %>