diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index 0610705e..d91d3de1 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -184,6 +184,11 @@
               v-else-if="field.type === 'number' && !isContenteditable"
               class="whitespace-pre-wrap"
             >{{ formatNumber(field.default_value, field.preferences?.format) }}</span>
+            <span
+              v-else-if="field.default_value === '{{date}}'"
+            >
+              {{ t('signing_date') }}
+            </span>
             <span
               v-else
               ref="defaultValue"
@@ -211,7 +216,7 @@
       ref="touchTarget"
       class="absolute top-0 bottom-0 right-0 left-0"
       :class="isDragged ? 'cursor-grab' : 'cursor-pointer'"
-      @dblclick="maybeFocusDefaultValue"
+      @dblclick="maybeToggleDefaultValue"
     />
     <span
       v-if="field?.type && editable"
@@ -454,7 +459,7 @@ export default {
     closeDropdown () {
       document.activeElement.blur()
     },
-    maybeFocusDefaultValue () {
+    maybeToggleDefaultValue () {
       if (['text', 'number'].includes(this.field.type)) {
         this.isContenteditable = true
 
@@ -468,6 +473,11 @@ export default {
             )
           }
         })
+      } else if (this.field.type === 'date') {
+        this.field.readonly = !this.field.readonly
+        this.field.default_value === '{{date}}' ? delete this.field.default_value : this.field.default_value = '{{date}}'
+
+        this.save()
       }
     },
     formatNumber (number, format) {
diff --git a/app/javascript/template_builder/i18n.js b/app/javascript/template_builder/i18n.js
index a2af0b8c..56fe5088 100644
--- a/app/javascript/template_builder/i18n.js
+++ b/app/javascript/template_builder/i18n.js
@@ -27,6 +27,7 @@ const en = {
   are_you_sure: 'Are you sure?',
   sign_yourself: 'Sign Yourself',
   set_signing_date: 'Set signing date',
+  signing_date: 'Signing Date',
   send: 'Send',
   remove: 'Remove',
   edit: 'Edit',