diff --git a/source/app/blueprints/case/templates/case.html b/source/app/blueprints/case/templates/case.html
index e1ba37042..9e6e213e3 100644
--- a/source/app/blueprints/case/templates/case.html
+++ b/source/app/blueprints/case/templates/case.html
@@ -152,7 +152,7 @@ <h4 class="m-0 font-weight-bold">Case summary {{ "(Syncing with DB )" if case.i
                                     <div class="row">
                                         <div class="col-md-6" id="container_editor_summary">
                                             <div style="display: none" id="fetched_crc"></div>
-                                            <div id="editor_summary" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
+                                            <div id="editor_summary" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
                                             <textarea id="case_summary" rows="10" cols="82" style="display: none"></textarea>
                                         </div>
                                         <div class="col-md-6" id="ctrd_casesum">
diff --git a/source/app/blueprints/case/templates/case_notes_v2.html b/source/app/blueprints/case/templates/case_notes_v2.html
index 810a7ca3d..516a921de 100644
--- a/source/app/blueprints/case/templates/case_notes_v2.html
+++ b/source/app/blueprints/case/templates/case_notes_v2.html
@@ -137,7 +137,7 @@ <h4 class="page-title mb-0" id="currentNoteTitle"></h4>
 						<div class="row" id="noteContentScroll">
 							<div class="col-md-12 col-lg-6" id="container_note_content">
 								<div style="display: none" id="fetched_crc"></div>
-								<div id="editor_detail" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
+								<div id="editor_detail" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
 								<textarea id="note_content" rows="10" cols="82" style="display: none"></textarea>
 							</div>
 							<div class="col-md-12 col-lg-6" id="ctrd_notesum">
diff --git a/source/app/blueprints/case/templates/modal_add_case_asset.html b/source/app/blueprints/case/templates/modal_add_case_asset.html
index a643508fc..7b1283899 100644
--- a/source/app/blueprints/case/templates/modal_add_case_asset.html
+++ b/source/app/blueprints/case/templates/modal_add_case_asset.html
@@ -64,7 +64,7 @@ <h4 class="modal-title mr-4">{{ "Asset #{}".format(asset.asset_id) if asset.asse
                                         </div>
                                         <div class="row" style="margin-left:0px;">
                                             <div class="col-12" id="container_asset_desc_content">
-                                                <div id="asset_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if asset %}{{ asset.asset_description  }}{% endif %}</div>
+                                                <div id="asset_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if asset %}{{ asset.asset_description  }}{% endif %}</div>
                                                 <textarea id="asset_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                             </div>
                                             <div class="col-12" id="container_asset_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_add_case_event.html b/source/app/blueprints/case/templates/modal_add_case_event.html
index 14cd5553f..f3ecfb92d 100644
--- a/source/app/blueprints/case/templates/modal_add_case_event.html
+++ b/source/app/blueprints/case/templates/modal_add_case_event.html
@@ -92,7 +92,7 @@ <h4 class="modal-title mr-4">{% if event.event_id %} Event ID #{{ event.event_i
                                             </div>
                                             <div class="row" style="margin-left:0px;">
                                                 <div class="col-12" id="container_event_desc_content">
-                                                    <div id="event_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if event.event_content %}{{ event.event_content  }}{% endif %}</div>
+                                                    <div id="event_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if event.event_content %}{{ event.event_content  }}{% endif %}</div>
                                                     <textarea id="event_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                                 </div>
                                                 <div class="col-12" id="container_event_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_add_case_ioc.html b/source/app/blueprints/case/templates/modal_add_case_ioc.html
index af6d77579..410f5fd94 100644
--- a/source/app/blueprints/case/templates/modal_add_case_ioc.html
+++ b/source/app/blueprints/case/templates/modal_add_case_ioc.html
@@ -85,7 +85,7 @@ <h4 class="modal-title mr-4">{% if ioc.ioc_id %}Edit IOC #{{ ioc.ioc_id }}{% els
                                     </div>
                                     <div class="row" style="margin-left:0px;">
                                         <div class="col-12" id="container_ioc_desc_content">
-                                            <div id="ioc_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if ioc and ioc.ioc_description %}{{ ioc.ioc_description  }}{% endif %}</div>
+                                            <div id="ioc_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if ioc and ioc.ioc_description %}{{ ioc.ioc_description  }}{% endif %}</div>
                                             <textarea id="ioc_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                         </div>
                                         <div class="col-12" id="container_ioc_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_add_case_multi_asset.html b/source/app/blueprints/case/templates/modal_add_case_multi_asset.html
index 2f5f653a1..e3a9e549d 100644
--- a/source/app/blueprints/case/templates/modal_add_case_multi_asset.html
+++ b/source/app/blueprints/case/templates/modal_add_case_multi_asset.html
@@ -48,7 +48,7 @@ <h4 class="modal-title mr-4">Add multiple assets</h4>
                                         </div>
                                         <div class="row" style="margin-left:0px;">
                                             <div class="col-12" id="container_asset_desc_content">
-                                                <div id="asset_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if asset %}{{ asset.asset_description  }}{% endif %}</div>
+                                                <div id="asset_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if asset %}{{ asset.asset_description  }}{% endif %}</div>
                                                 <textarea id="asset_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                             </div>
                                             <div class="col-12" id="container_asset_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_add_case_rfile.html b/source/app/blueprints/case/templates/modal_add_case_rfile.html
index 75fce86aa..9a13341d7 100644
--- a/source/app/blueprints/case/templates/modal_add_case_rfile.html
+++ b/source/app/blueprints/case/templates/modal_add_case_rfile.html
@@ -113,7 +113,7 @@ <h4 class="modal-title mr-4">{% if rfile.id %}Edit evidence #{{rfile.id}}{% else
                                         </div>
                                         <div class="row" style="margin-left:0px;">
                                             <div class="col-12" id="container_evidence_desc_content">
-                                                <div id="evidence_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if rfile %}{{ rfile.file_description  }}{% endif %}</div>
+                                                <div id="evidence_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if rfile %}{{ rfile.file_description  }}{% endif %}</div>
                                                 <textarea id="evidence_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                             </div>
                                             <div class="col-12" id="container_evidence_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_add_case_task.html b/source/app/blueprints/case/templates/modal_add_case_task.html
index bfc32395c..78e03aa62 100644
--- a/source/app/blueprints/case/templates/modal_add_case_task.html
+++ b/source/app/blueprints/case/templates/modal_add_case_task.html
@@ -71,7 +71,7 @@ <h4 class="modal-title mr-4">{% if task.id %} Task ID #{{ task.id }}{% else %}
                                         </div>
                                         <div class="row" style="margin-left:0px;">
                                             <div class="col-12" id="container_task_desc_content">
-                                                <div id="task_description" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if task.task_description %}{{ task.task_description  }}{% endif %}</div>
+                                                <div id="task_description" contenteditable="true" spellcheck="true" class="mr-2" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}">{% if task.task_description %}{{ task.task_description  }}{% endif %}</div>
                                                 <textarea id="task_desc_content" rows="10" cols="82" style="display: none"></textarea>
                                             </div>
                                             <div class="col-12" id="container_task_description" style="display:none">
diff --git a/source/app/blueprints/case/templates/modal_conversation.html b/source/app/blueprints/case/templates/modal_conversation.html
index 04e50c9bf..91ee2d86b 100644
--- a/source/app/blueprints/case/templates/modal_conversation.html
+++ b/source/app/blueprints/case/templates/modal_conversation.html
@@ -30,7 +30,7 @@ <h4 class="modal-title mt-2 mr-4 text-truncate">Comments on <i>{{ title }}</i></
                             </div>
                             <div class="row mb-3">
                                 <div class="col-12 comment-content" id="container_comment_content">
-                                    <div id="comment_message" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
+                                    <div id="comment_message" contenteditable="true" spellcheck="true" data-theme="{% if current_user.in_dark_mode %}dark{% else %}light{% endif %}"></div>
                                     <textarea id="comment_content" rows="2" style="display: none"></textarea>
                                 </div>
                                 <div class="col-12 comment-content" id="container_comment_preview" style="display:none;">