diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
index 2ca5a97e8cc3..f02c1f1ce65d 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
@@ -8,9 +8,15 @@
         class="content-type__new-content-banner"
         *ngIf="newContentEditorEnabled"
         data-test-id="content-type__new-content-banner">
-        <p-checkbox class="p-checkbox-sm" formControlName="newEditContent" binary="true">
+        <p-checkbox
+            class="p-checkbox-sm"
+            formControlName="newEditContent"
+            binary="true"
+            inputId="newEditContentLabel">
         </p-checkbox>
-        <span [innerHTML]="'content.type.form.banner.message' | dm"></span>
+        <label for="newEditContentLabel"
+            ><span [innerHTML]="'content.type.form.banner.message' | dm"></span
+        ></label>
     </div>
     <div class="field form__group--validation">
         <label dotFieldRequired for="content-type-form-name">{{ nameFieldLabel }}</label>
diff --git a/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html b/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html
index fc9ea2c025f2..74815ef7efb9 100644
--- a/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html
+++ b/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html
@@ -19,7 +19,7 @@
                         *ngFor="let field of column.fields"
                         [field]="field"
                         [contentlet]="formData.contentlet"
-                        [contentType]="formData.contentType"
+                        [contentType]="formData.contentType.variable"
                         data-testId="field" />
                 </div>
             </div>
diff --git a/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts b/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts
index 52a1eb7ea9aa..4140b6256615 100644
--- a/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts
+++ b/core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts
@@ -89,6 +89,10 @@ describe('DotFormComponent', () => {
             const fields = spectator.queryAll(DotEditContentFieldComponent);
             JUST_FIELDS_MOCKS.forEach((field, index) => {
                 expect(fields[index].field).toEqual(field);
+                expect(fields[index].contentType).toEqual(
+                    CONTENT_FORM_DATA_MOCK.contentType.variable
+                );
+                expect(fields[index].contentlet).toEqual(CONTENT_FORM_DATA_MOCK.contentlet);
             });
         });
 
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
index 00697cb31829..6dd00d7f57ba 100644
--- a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
+++ b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
@@ -395,13 +395,14 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
                 var permissions = data["permissions"];
                 var write = userHasWritePermission (data, userId)?"1":"0";
                 var structure_id = data["structureInode"];
+                var typeVariable = data["typeVariable"];
 
                 var editRef = '';
 
             if(structure_id == '<%=calendarEventInode %>'){
-              editRef = " editEvent('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ") ";
+              editRef = " editEvent('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ", '" + typeVariable + "') ";
             }else{
-              editRef = " editContentlet('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ") ";
+              editRef = " editContentlet('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ", '" + typeVariable + "') ";
             }
 
             var ref = "<a onMouseOver=\"style.cursor='pointer'\" href=\"javascript: " + editRef + "\">";
@@ -1930,11 +1931,12 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
 			var liveSt = data.live === "true" ? "1" : "0";
 			var workingSt = data.working === "true" ? "1" : "0";
 			var write = userHasWritePermission (data, userId) ? "1" : "0";
+			var typeVariable = data.typeVariable;
 
 			if (data.structureInode == '<%=calendarEventInode %>') {
-				editEvent(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write);
+				editEvent(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write, typeVariable);
 			}else{
-				editContentlet(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write);
+				editContentlet(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write, typeVariable);
 			}
 		};
 
@@ -1954,6 +1956,7 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
 			const contentStructureType = data["contentStructureType"];
 			const structure_id = data["structureInode"];
 			const hasLiveVersion = data["hasLiveVersion"];
+			const typeVariable = data.typeVariable;
 
 			const contentAdmin = new dotcms.dijit.contentlet.ContentAdmin(data.identifier, data.inode, data.languageId);
 			const wfActionMapList = JSON.parse(data["wfActionMapList"]);
@@ -1961,11 +1964,11 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
 			if ((live || working) && (read=="1") && (!deleted)) {
 				if(structure_id == '<%=calendarEventInode %>'){
 					actions.push({ label: write === '1' ? '<%=LanguageUtil.get(pageContext, "Edit") %>' : '<%=LanguageUtil.get(pageContext, "View") %>',
-						action: () => { editEvent(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write)}
+						action: () => { editEvent(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write, typeVariable)}
 					});
 				} else {
 					actions.push({ label: write === '1' ? '<%=LanguageUtil.get(pageContext, "Edit") %>' : '<%=LanguageUtil.get(pageContext, "View") %>',
-						action: () => { editContentlet(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write)}
+						action: () => { editContentlet(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write, typeVariable)}
 					});
 				}
 			}
@@ -2086,6 +2089,7 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
                 var wfActionMapList;
                 var structure_id;
                 var contentStructureType;
+                var typeVariable;
 
                 cbContentInodeList = data;
 
@@ -2130,15 +2134,17 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
                     write = userHasWritePermission (cellData, userId)?"1":"0";
                     publish = userHasPublishPermission (cellData, userId)?"1":"0";
                     contentStructureType = cellData["contentStructureType"];
+                    typeVariable = cellData["typeVariable"];
                     structure_id = cellData["structureInode"];
                     hasLiveVersion = cellData["hasLiveVersion"];
                     holderDiv.setAttribute('data-inode', cellData["inode"]);
                     holderDiv.setAttribute('data-live', liveSt);
                     holderDiv.setAttribute('data-working', workingSt);
                     holderDiv.setAttribute('data-write', write);
+                    holderDiv.setAttribute('data-typevariable', typeVariable);
                     holderDiv.addEventListener('click', function(e){
                         let dataSet =  e.currentTarget.dataset;
-                        editContentlet(dataSet["inode"],'<%= user.getUserId() %>','<%= referer %>', dataSet["live"] , dataSet["working"] , dataSet["write"] );
+                        editContentlet(dataSet["inode"],'<%= user.getUserId() %>','<%= referer %>', dataSet["live"] , dataSet["working"] , dataSet["write"], dataSet["typevariable"] );
                     }, false);
 
 
@@ -2233,15 +2239,15 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
                     if ((live || working) && (read=="1") && (!deleted)) {
                             if(structure_id == '<%=calendarEventInode %>'){
                                 if (write=="1"){
-                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
+                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
                                 }else{
-                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "View") %></div>";
+                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "View") %></div>";
                                 }
                             }else{
                                 if (write=="1"){
-                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
+                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
                                 }else{
-                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "View") %></div>";
+                                popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "View") %></div>";
                                 }
                             }
                     }