diff --git a/addform.html b/addform.html
index 0046fdc..6ad915b 100644
--- a/addform.html
+++ b/addform.html
@@ -1437,9 +1437,10 @@ $('#Question_description_workarea').focus(function() {
 
 });
 
+var toolbarworkarea = "bold,italic,underline,strikethrough,|,superscript,subscript,|,align,";
 
 const workarea = Jodit.make("#workarea", {
-	buttons:toolbar,
+	buttons:toolbarworkarea,
 	showPlaceholder: false,
 	toolbarButtonSize: 'small',  
 	showPlaceholder: false,
@@ -1503,6 +1504,10 @@ check_Remove_Empty_Question('Question_title');
 
 });
 
+setInterval(function() {
+    addListenersToButtons('Question_title');
+}, 1000);
+
 json2nav();
 clearSidebarWrapper();
 navpane();
@@ -1531,7 +1536,9 @@ check_Remove_Empty_Question('Max_Marks');
 
 });
 
-
+setInterval(function() {
+    addListenersToButtons('Max_Marks');
+}, 1000);
 
 document.addEventListener('DOMContentLoaded', function() {
     var currentYear = new Date().getFullYear();
@@ -2365,6 +2372,11 @@ function addSection(title = false, description = false, random_no = false, secti
 
 				});
 
+
+				setInterval(function() {
+					addListenersToButtons(sectionID);
+				}, 1000);
+
                 var DisplayMark_RawID = 'Section_Display_Marks_Id_' + sectionRandomID
                 var DisplayMark_ID = document.getElementById(DisplayMark_RawID)
 
@@ -2771,6 +2783,9 @@ function addQuestionGroup(idObj)
 			localStorage.setItem('savePreventDefault', targetId);
 
 		});
+		setInterval(function() {
+			addListenersToButtons(question_groupid);
+		}, 1000);
 
 		var question_group_description = 'subSectionDescriptionWorkarea_'+ QuestionGroup_ID;
 		var inputElemen = document.getElementById(question_group_description);
@@ -2786,7 +2801,9 @@ function addQuestionGroup(idObj)
 
 		});
 
-		
+		setInterval(function() {
+			addListenersToButtons(question_group_description);
+		}, 1000);
 
 		var question_groupi = 'Questions_Group_id_'+ QuestionGroup_ID;
 		var inputElemen = document.getElementById(question_groupi);
@@ -2802,6 +2819,10 @@ function addQuestionGroup(idObj)
 
 		});
 
+		setInterval(function() {
+			addListenersToButtons(question_groupi);
+		}, 1000);
+
 		// function for calling html2json using Mark Calculation
 		var Question_Group_Marks_Field = 'Question_Group_Marks_Id_' + QuestionGroup_ID;
 		var Question_Attempt_Any_Fields = 'Question_Attempt_Any_Id_'+ QuestionGroup_ID;
@@ -2856,6 +2877,7 @@ function addQuestionGroup(idObj)
 			var textQuestionSerialNo = substringToRemove+QuestionGroup_ID;
 			check_Remove_Empty_Question(textQuestionSerialNo,1);
 
+
 			element.parentNode.removeChild(element);
 			// localStorage.removeItem('yourKey');
 			// console.log(element)
@@ -3607,6 +3629,9 @@ $(innerDivElement).keyup(function(event) {
 
 });
 
+setInterval(function() {
+    addListenersToButtons(choiceid);
+}, 1000);
 // var textQuestiontitle_math = 'textQuestiontitle_math_'+addChoiceAreaId;
 // var textQuestiontitle_mathId = document.getElementById(textQuestiontitle_math)
 
@@ -3619,6 +3644,8 @@ $(textQuestiontitle_mathId).keyup(function(event) {
 
 });
 
+
+
 $(document).on("click", function (event) {
 
 const targetElement = event.target;
@@ -4453,6 +4480,10 @@ var tempQuestionTitle = inputElement.innerHTML;
 		localStorage.setItem('savePreventDefault', Textid)
 	});
 
+	setInterval(function() {
+		addListenersToButtons(Textid);
+	}, 1000);
+
 	$(textQuestiontitle_mathId).keyup(function(event) {
 		json2nav();
 		clearSidebarWrapper();
@@ -4461,6 +4492,7 @@ var tempQuestionTitle = inputElement.innerHTML;
 	});
      
 
+
 	$(document).on("click", function (event) {
 
 	const targetElement = event.target;
@@ -4494,6 +4526,10 @@ var tempQuestionTitle = inputElement.innerHTML;
     	SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId)
 	});
 
+	setInterval(function() {
+		addListenersToButtons(Texti);
+	}, 1000);
+
   // function for calling html2json using Mark Calculation
 	var textQuestionMarkField = 'Text_Question_Marks_Id_'+ addTextQuestionId
 	$('#'+textQuestionMarkField).keyup(function() {
@@ -6319,5 +6355,36 @@ document.addEventListener('keyup', nagvigationAlgimnetDragandDrop);
 
 
 
+<script>
+	
+	function addListenersToButtons(id) {
+    var joditPrimaryButtton = document.querySelector('.jodit-ui-button_variant_primary');
+    var joditInsertAsTextButton = document.querySelector('.jodit-ui-button_insert_as_text');
+    var joditInsertOnlyTextButton = document.querySelector('.jodit-ui-button_insert_only_text');
+
+    if (joditPrimaryButtton) {
+        joditPrimaryButtton.addEventListener('click', function(event) {
+            check_Remove_Empty_Question(id);
+        });
+    }
+
+    if (joditInsertAsTextButton) {
+        joditInsertAsTextButton.addEventListener('click', function(event) {
+            check_Remove_Empty_Question(id);
+        });
+    }
+
+    if (joditInsertOnlyTextButton) {
+        joditInsertOnlyTextButton.addEventListener('click', function(event) {
+            check_Remove_Empty_Question(id);
+        });
+    }
+}
+
+
+</script>
+
+
+
 </body>
 </html>
diff --git a/assets/appSetting/AppSetting.json b/assets/appSetting/AppSetting.json
index ba4da1e..125fe2c 100644
--- a/assets/appSetting/AppSetting.json
+++ b/assets/appSetting/AppSetting.json
@@ -1 +1 @@
-{"AppSetting":["SubTitle,TextQuestionButton,MCQQuestionButton"]}
\ No newline at end of file
+{"AppSetting":["WorkArea,SubTitle,MathCheckbox,TextQuestionButton,MCQQuestionButton"]}
\ No newline at end of file
diff --git a/assets/appSetting/AppSettingUnchecked.json b/assets/appSetting/AppSettingUnchecked.json
index 51e217a..7bd161a 100644
--- a/assets/appSetting/AppSettingUnchecked.json
+++ b/assets/appSetting/AppSettingUnchecked.json
@@ -1 +1 @@
-{"AppSetting":["WorkArea,MathCheckbox"]}
\ No newline at end of file
+{"AppSetting":[""]}
\ No newline at end of file