diff --git a/public/assets/js/ui-create.js b/public/assets/js/ui-create.js
index 50c2c70..84798a1 100644
--- a/public/assets/js/ui-create.js
+++ b/public/assets/js/ui-create.js
@@ -26,6 +26,16 @@ export function initCreate(){
       apiName.className='w-full border rounded-lg px-3 py-2';
       apiName.id='f-api-name';
       fields.appendChild(apiName);
+      const editorSelect = document.createElement('select');
+      editorSelect.id = 'f-editor-type';
+      editorSelect.className = 'w-full border rounded-lg px-3 py-2';
+      editorSelect.innerHTML = `
+        <option value="grapesjs">GrapesJS</option>
+        <option value="craftjs">Craft.js</option>
+      `;
+      const defaultEditor = (window.__editorDefault || 'grapesjs').toLowerCase();
+      editorSelect.value = defaultEditor === 'craftjs' ? 'craftjs' : 'grapesjs';
+      fields.appendChild(editorSelect);
       apiName.addEventListener('input', ()=>{
         apiTouched = true;
         const next = normalizeApiName(apiName.value);
@@ -46,6 +56,7 @@ export function initCreate(){
       if(tab==='templates') {
         payload.api_name=(document.getElementById('f-api-name')?.value||'').trim();
         if(!payload.api_name) return;
+        payload.editor_type=(document.getElementById('f-editor-type')?.value||'grapesjs');
       }
       if(tab==='snippets') payload.content=''; else payload.html='';
       if(tab==='sections') payload.template_id=document.getElementById('f-template')?.value||null;
diff --git a/public/assets/js/ui-user.js b/public/assets/js/ui-user.js
index 8906e00..dd1d24a 100644
--- a/public/assets/js/ui-user.js
+++ b/public/assets/js/ui-user.js
@@ -275,6 +275,7 @@ function fillSettingsForm(settings) {
   if (settingsForm.editor_default) {
     settingsForm.editor_default.value = settings.editor_default || 'grapesjs';
   }
+  window.__editorDefault = settings.editor_default || 'grapesjs';
   state.rotate = { bridge: false, sender: false, external: false };
   refreshAdminTables(settings.bridge_setup?.tables || [], settings.bridge_tables || []);
 }