diff --git a/resources/views/components/attribute-type.blade.php b/resources/views/components/attribute-type.blade.php
index 68813d4e..d2355af7 100644
--- a/resources/views/components/attribute-type.blade.php
+++ b/resources/views/components/attribute-type.blade.php
@@ -46,7 +46,7 @@
 							</span>
 						@endif
 
-						@if((! $o->no_attr_tags) && (! $o->is_rdn))
+						@if((! $o->no_attr_tags) && (! $o->is_rdn) && (! $template))
 							<span data-bs-toggle="tab" href="#langtag-{{ $o->name_lc }}-+" class="bg-primary-subtle btn btn-outline-primary border-primary addable d-none">
 								<i class="fas fa-fw fa-plus text-dark" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" aria-label="Add Lang Tag" data-bs-original-title="Add Lang Tag"></i>
 							</span>
diff --git a/resources/views/components/attribute.blade.php b/resources/views/components/attribute.blade.php
index 9df670e0..4a501ed2 100644
--- a/resources/views/components/attribute.blade.php
+++ b/resources/views/components/attribute.blade.php
@@ -1,5 +1,5 @@
 <!-- $o=Attribute::class -->
-<x-attribute.layout :edit="$edit=($edit ?? FALSE)" :new="$new=($new ?? FALSE)" :o="$o">
+<x-attribute.layout :edit="$edit=($edit ?? FALSE)" :new="$new=($new ?? FALSE)" :o="$o" :template="$template">
 	<div class="col-12">
 		<div class="tab-content">
 			@foreach($o->langtags as $langtag)
diff --git a/resources/views/components/attribute/layout.blade.php b/resources/views/components/attribute/layout.blade.php
index e7163110..1aa3dc8b 100644
--- a/resources/views/components/attribute/layout.blade.php
+++ b/resources/views/components/attribute/layout.blade.php
@@ -4,7 +4,7 @@
 			{{ $slot }}
 		</attribute>
 
-		<x-attribute.widget.options :o="$o" :edit="$edit" :new="$new"/>
+		<x-attribute.widget.options :o="$o" :edit="$edit" :new="$new" :template="$template ?? FALSE"/>
 	</div>
 </div>
 
diff --git a/resources/views/components/attribute/widget/options.blade.php b/resources/views/components/attribute/widget/options.blade.php
index b5ab7dae..09a07a43 100644
--- a/resources/views/components/attribute/widget/options.blade.php
+++ b/resources/views/components/attribute/widget/options.blade.php
@@ -255,18 +255,18 @@
 			@default
 				@if($o->isDynamic()) @break @endif
 				@php($clone=TRUE)
-				@if($o->values_old->count())
-					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-attribute="{{ $o->name }}" id="{{ $o->name_lc }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
+				@if($o->values_old->count() && (! $template))
+					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-attribute="{{ $o->name_lc }}" id="{{ $o->name_lc }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
 				@endif
 
 				@section('page-scripts')
-					@if($clone && $edit && $o->can_addvalues)
+					@if((! $template) && $clone && $edit && $o->can_addvalues)
 						<script type="text/javascript">
 							$(document).ready(function() {
 								// Create a new entry when Add Value clicked
-								$('#{{ $o->name_lc }}-addnew.addable').click(function(item) {
+								$('form#dn-edit #{{ $o->name_lc }}-addnew.addable').click(function(item) {
 									var attribute = $(this).data('attribute');
-									var active = $('attribute[id='+attribute+']').find('.tab-pane.active');
+									var active = $('#template-default attribute[id='+attribute+']');
 
 									active.find('input:last')
 										.clone()