diff --git a/word/Editor/Paragraph/draw/line-draw-state.js b/word/Editor/Paragraph/draw/line-draw-state.js
index 90129bff55..b5993d542f 100644
--- a/word/Editor/Paragraph/draw/line-draw-state.js
+++ b/word/Editor/Paragraph/draw/line-draw-state.js
@@ -413,10 +413,10 @@
 			if (form.IsTextForm() && form.GetTextFormPr().IsComb())
 				combMax = form.GetTextFormPr().GetMaxCharacters();
 
-			if (!form.IsMainForm())
+			if (!form.IsMainForm() && form.GetMainForm() && !form.GetMainForm().IsLabeledCheckBox())
 				form = form.GetMainForm();
 			
-			if (form.IsFormRequired() && form.CheckOFormUserMaster() && this.logicDocument.IsHighlightRequiredFields() && !this.Graphics.isPrintMode)
+			if (form.IsFormRequired() && !form.IsLabeledCheckBox() && form.CheckOFormUserMaster() && this.logicDocument.IsHighlightRequiredFields() && !this.Graphics.isPrintMode)
 				formBorder = this.logicDocument.GetRequiredFieldsBorder();
 			else if (form.GetFormPr().GetBorder())
 				formBorder = form.GetFormPr().GetBorder();
diff --git a/word/apiBuilder.js b/word/apiBuilder.js
index 9a2eac2969..0c45a7f220 100644
--- a/word/apiBuilder.js
+++ b/word/apiBuilder.js
@@ -24648,9 +24648,16 @@
 		return executeNoFormLockCheck(function() {
 			let mainForm = this.Sdt.GetMainForm();
 			if (mainForm && mainForm !== this.Sdt && mainForm.IsLabeledCheckBox())
+			{
 				mainForm.SetCheckBoxLabel(label);
+			}
 			else
+			{
 				this.Sdt.SetCheckBoxLabel(label);
+				let innerCheckBox = this.Sdt.IsLabeledCheckBox() ? this.Sdt.GetInnerCheckBox() : null;
+				if (innerCheckBox)
+					this.Sdt = innerCheckBox;
+			}
 			
 			return true;
 		}, this);