diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupNewTemplate.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupNewTemplate.jsp
index 87fe9a89ca11..1fd53b6d1e74 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupNewTemplate.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/group/groupNewTemplate.jsp
@@ -1,7 +1,7 @@
 <%@ include file="../assetsJsp/commonTaglib.jsp"%>
 
 
-<form id="newGroupTemplateFormId" class="form-horizontal" method="post" action="UiV2Template.customTemplateExecute" enctype = "multipart/form-data">
+<form id="newGroupTemplateFormId" class="form-horizontal" method="post" action="UiV2Template.customTemplateExecute" enctype="multipart/form-data" onsubmit="return false;" onkeydown="if(event.key==='Enter' && event.target.tagName.toLowerCase() !== 'textarea'){if($('#newGroupTemplateFormId a.btn-primary').length){guiSubmitFileForm(event, '#newGroupTemplateFormId', '../app/UiV2Template.customTemplateExecute');}}">
   <input type="hidden" name="groupId" value="${grouperRequestContainer.groupContainer.guiGroup.group.id}" />
 
   <grouper:browserPage jspName="newTemplate" />
diff --git a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemNewTemplate.jsp b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemNewTemplate.jsp
index 0f9cefd23cb4..3cab331f58c8 100644
--- a/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemNewTemplate.jsp
+++ b/grouper-ui/webapp/WEB-INF/grouperUi2/stem/stemNewTemplate.jsp
@@ -3,7 +3,7 @@
 
 <c:choose>
   <c:when test="${grouperRequestContainer.groupStemTemplateContainer.guiGshTemplateConfig != null}">
-    <form id="newStemTemplateFormId" class="form-horizontal" method="post" action="UiV2Template.customTemplateExecute" enctype = "multipart/form-data">
+    <form id="newStemTemplateFormId" class="form-horizontal" method="post" action="UiV2Template.customTemplateExecute" enctype="multipart/form-data" onsubmit="return false;" onkeydown="if(event.key==='Enter' && event.target.tagName.toLowerCase() !== 'textarea'){if($('#newStemTemplateFormId a.btn-primary').length){guiSubmitFileForm(event, '#newStemTemplateFormId', '../app/UiV2Template.customTemplateExecute');}}">
   </c:when>
   <c:otherwise>
     <form id="newStemTemplateFormId" class="form-horizontal">