diff --git a/Helper/ConfigHelper.cs b/Helper/ConfigHelper.cs
index 87c7fae..3a85f8d 100644
--- a/Helper/ConfigHelper.cs
+++ b/Helper/ConfigHelper.cs
@@ -94,6 +94,7 @@ namespace CarCareTracker.Helper
                 EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)]),
                 HideZero = bool.Parse(_config[nameof(UserConfig.HideZero)]),
                 UseUKMPG = bool.Parse(_config[nameof(UserConfig.UseUKMPG)]),
+                UseMarkDownOnSavedNotes = bool.Parse(_config[nameof(UserConfig.UseMarkDownOnSavedNotes)]),
                 UseThreeDecimalGasCost = bool.Parse(_config[nameof(UserConfig.UseThreeDecimalGasCost)]),
                 EnableAutoReminderRefresh = bool.Parse(_config[nameof(UserConfig.EnableAutoReminderRefresh)]),
                 EnableAutoOdometerInsert = bool.Parse(_config[nameof(UserConfig.EnableAutoOdometerInsert)]),
diff --git a/Models/UserConfig.cs b/Models/UserConfig.cs
index c73698c..2a9899e 100644
--- a/Models/UserConfig.cs
+++ b/Models/UserConfig.cs
@@ -10,6 +10,7 @@
         public bool HideZero { get; set; }
         public bool UseUKMPG {get;set;}
         public bool UseThreeDecimalGasCost { get; set; }
+        public bool UseMarkDownOnSavedNotes { get; set; }
         public bool EnableAutoReminderRefresh { get; set; }
         public bool EnableAutoOdometerInsert { get; set; }
         public string UserNameHash { get; set; }
diff --git a/Views/Home/_Settings.cshtml b/Views/Home/_Settings.cshtml
index b883bc1..4023293 100644
--- a/Views/Home/_Settings.cshtml
+++ b/Views/Home/_Settings.cshtml
@@ -35,6 +35,10 @@
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useThreeDecimal" checked="@Model.UseThreeDecimalGasCost">
             <label class="form-check-label" for="useThreeDecimal">Use Three Decimals For Fuel Cost</label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="useMarkDownOnSavedNotes" checked="@Model.UseMarkDownOnSavedNotes">
+            <label class="form-check-label" for="useMarkDownOnSavedNotes">Display Saved Notes in Markdown</label>
+        </div>
         <div class="form-check form-switch">
             <input class="form-check-input" onChange="updateSettings()" type="checkbox" role="switch" id="enableAutoReminderRefresh" checked="@Model.EnableAutoReminderRefresh">
             <label class="form-check-label" for="enableAutoReminderRefresh">Auto Refresh Lapsed Recurring Reminders</label>
@@ -212,6 +216,7 @@
             hideZero: $("#hideZero").is(":checked"),
             useUKMpg: $("#useUKMPG").is(":checked"),
             useThreeDecimalGasCost: $("#useThreeDecimal").is(":checked"),
+            useMarkDownOnSavedNotes: $("#useMarkDownOnSavedNotes").is(":checked"),
             enableAutoReminderRefresh: $("#enableAutoReminderRefresh").is(":checked"),
             enableAutoOdometerInsert: $("#enableAutoOdometerInsert").is(":checked"),
             visibleTabs: visibleTabs,
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index 259197d..ec212d4 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -5,6 +5,7 @@
     var userConfig = config.GetUserConfig(User);
     var useDarkMode = userConfig.UseDarkMode;
     var enableCsvImports = userConfig.EnableCsvImports;
+    var useMarkDown = userConfig.UseMarkDownOnSavedNotes;
     var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
     var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
     shortDatePattern = shortDatePattern.ToLower();
@@ -47,7 +48,8 @@
         function getGlobalConfig() {
             return {
                 useDarkMode : "@useDarkMode" == "True",
-                enableCsvImport : "@enableCsvImports" == "True"
+                enableCsvImport : "@enableCsvImports" == "True",
+                useMarkDown: "@useMarkDown" == "True"
             }
         }
         function getShortDatePattern() {
diff --git a/appsettings.json b/appsettings.json
index e99b182..a4508f7 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -16,6 +16,7 @@
   "EnableAutoOdometerInsert": false,
   "UseUKMPG": false,
   "UseThreeDecimalGasCost": true,
+  "UseMarkDownOnSavedNotes":  false,
   "VisibleTabs": [ 0, 1, 4, 2, 3, 6, 5, 8 ],
   "DefaultTab": 8,
   "UserNameHash": "",
diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js
index 47f1ba2..fb9abf8 100644
--- a/wwwroot/js/collisionrecord.js
+++ b/wwwroot/js/collisionrecord.js
@@ -15,6 +15,11 @@ function showEditCollisionRecordModal(collisionRecordId) {
             //initiate datepicker
             initDatePicker($('#collisionRecordDate'));
             $('#collisionRecordModal').modal('show');
+            $('#collisionRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("collisionRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
index d984aad..851ce47 100644
--- a/wwwroot/js/gasrecord.js
+++ b/wwwroot/js/gasrecord.js
@@ -15,6 +15,11 @@ function showEditGasRecordModal(gasRecordId) {
             //initiate datepicker
             initDatePicker($('#gasRecordDate'));
             $('#gasRecordModal').modal('show');
+            $('#gasRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("gasRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/note.js b/wwwroot/js/note.js
index b71673a..03f2dd7 100644
--- a/wwwroot/js/note.js
+++ b/wwwroot/js/note.js
@@ -11,6 +11,11 @@ function showEditNoteModal(noteId) {
         if (data) {
             $("#noteModalContent").html(data);
             $('#noteModal').modal('show');
+            $('#noteModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("noteTextArea");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/odometerrecord.js b/wwwroot/js/odometerrecord.js
index 2266836..8968b95 100644
--- a/wwwroot/js/odometerrecord.js
+++ b/wwwroot/js/odometerrecord.js
@@ -15,6 +15,11 @@ function showEditOdometerRecordModal(odometerRecordId) {
             //initiate datepicker
             initDatePicker($('#odometerRecordDate'));
             $('#odometerRecordModal').modal('show');
+            $('#odometerRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("odometerRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
index 1c9a1f2..c17bf8e 100644
--- a/wwwroot/js/planrecord.js
+++ b/wwwroot/js/planrecord.js
@@ -15,6 +15,11 @@ function showEditPlanRecordModal(planRecordId) {
             //initiate datepicker
             initDatePicker($('#planRecordDate'));
             $('#planRecordModal').modal('show');
+            $('#planRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("planRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/reminderrecord.js b/wwwroot/js/reminderrecord.js
index 8594410..e76fe88 100644
--- a/wwwroot/js/reminderrecord.js
+++ b/wwwroot/js/reminderrecord.js
@@ -4,6 +4,11 @@
             $("#reminderRecordModalContent").html(data); 
             initDatePicker($('#reminderDate'), true);
             $("#reminderRecordModal").modal("show");
+            $('#reminderRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("reminderNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js
index b8ad524..cd57fe8 100644
--- a/wwwroot/js/servicerecord.js
+++ b/wwwroot/js/servicerecord.js
@@ -15,6 +15,11 @@ function showEditServiceRecordModal(serviceRecordId) {
             //initiate datepicker
             initDatePicker($('#serviceRecordDate'));
             $('#serviceRecordModal').modal('show');
+            $('#serviceRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("serviceRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/supplyrecord.js b/wwwroot/js/supplyrecord.js
index ba12e72..5253a49 100644
--- a/wwwroot/js/supplyrecord.js
+++ b/wwwroot/js/supplyrecord.js
@@ -15,6 +15,11 @@ function showEditSupplyRecordModal(supplyRecordId) {
             //initiate datepicker
             initDatePicker($('#supplyRecordDate'));
             $('#supplyRecordModal').modal('show');
+            $('#supplyRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("supplyRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js
index fb56671..21de508 100644
--- a/wwwroot/js/taxrecord.js
+++ b/wwwroot/js/taxrecord.js
@@ -15,6 +15,11 @@ function showEditTaxRecordModal(taxRecordId) {
             //initiate datepicker
             initDatePicker($('#taxRecordDate'));
             $('#taxRecordModal').modal('show');
+            $('#taxRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("taxRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/upgraderecord.js b/wwwroot/js/upgraderecord.js
index 86e8134..ef1b5cf 100644
--- a/wwwroot/js/upgraderecord.js
+++ b/wwwroot/js/upgraderecord.js
@@ -15,6 +15,11 @@ function showEditUpgradeRecordModal(upgradeRecordId) {
             //initiate datepicker
             initDatePicker($('#upgradeRecordDate'));
             $('#upgradeRecordModal').modal('show');
+            $('#upgradeRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
+                if (getGlobalConfig().useMarkDown) {
+                    toggleMarkDownOverlay("upgradeRecordNotes");
+                }
+            });
         }
     });
 }
diff --git a/wwwroot/js/vehicle.js b/wwwroot/js/vehicle.js
index b7d43b0..faa428c 100644
--- a/wwwroot/js/vehicle.js
+++ b/wwwroot/js/vehicle.js
@@ -415,8 +415,7 @@ function moveRecord(recordId, source, dest) {
         }
     });
 }
-function showLinks(e) {
-    var textAreaName = $(e.parentElement).attr("for");
+function toggleMarkDownOverlay(textAreaName) {
     var textArea = $(`#${textAreaName}`);
     if ($(".markdown-overlay").length > 0) {
         $(".markdown-overlay").remove();
@@ -429,7 +428,11 @@ function showLinks(e) {
     if (text.length > 0) {
         var formatted = markdown(text);
         //var overlay div
-        var overlayDiv = `<div class='markdown-overlay' style="position:absolute; top:${textArea.css('top')}; left:${textArea.css('left')}; width:${textArea.css('width')}; height:${textArea.css('height')}; padding:${textArea.css('padding')}; overflow-y:auto; background-color:var(--bs-modal-bg);">${formatted}</div>`;
-        $(e.parentElement).append(overlayDiv);
+        var overlayDiv = `<div class='markdown-overlay' onclick='(e) => {event.stopPropagation();}' style="z-index: 1060; position:absolute; top:${textArea.css('top')}; left:${textArea.css('left')}; width:${textArea.css('width')}; height:${textArea.css('height')}; padding:${textArea.css('padding')}; overflow-y:auto; background-color:var(--bs-modal-bg);">${formatted}</div>`;
+        textArea.parent().children(`label[for=${textAreaName}]`).append(overlayDiv);
     }
+}
+function showLinks(e) {
+    var textAreaName = $(e.parentElement).attr("for");
+    toggleMarkDownOverlay(textAreaName);
 }
\ No newline at end of file