diff --git a/public/index.html b/public/index.html
index 962c6f121..ae9631e55 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4508,10 +4508,11 @@
                                     <small data-i18n="Tags as Folders">Tags as Folders</small>
                                     <i title="Recent change: Tags must be marked as folders in the Tag Management menu to appear as such. Click here to bring it up." data-i18n="[title]Tags_as_Folders_desc" class="tags_view right_menu_button fa-solid fa-circle-exclamation"></i>
                                 </label>
-
+                                <label for="click_to_edit" class="checkbox_label" title="Click the message text in the chat log to edit it." data-i18n="[title]Click the message text in the chat log to edit it.">
+                                    <input id="click_to_edit" type="checkbox" />
+                                    <small data-i18n="Click to Edit">Click to Edit</small>
+                                </label>
                             </div>
-
-
                         </div>
                     </div>
                     <div name="UserSettingsSecondColumn" id="UI-Customization" class="flex-container flexFlowColumn wide100p flexNoGap flex1">
diff --git a/public/scripts/chats.js b/public/scripts/chats.js
index 3c5795709..51b272b50 100644
--- a/public/scripts/chats.js
+++ b/public/scripts/chats.js
@@ -1576,7 +1576,8 @@ jQuery(function () {
         await callGenericPopup(wrapper, POPUP_TYPE.TEXT, '', { wide: true, large: true });
     });
 
-    $(document).on('click', 'body.documentstyle .mes .mes_text', function () {
+    $(document).on('click', 'body .mes .mes_text', function () {
+        if (!power_user.click_to_edit) return;
         if (window.getSelection().toString()) return;
         if ($('.edit_textarea').length) return;
         $(this).closest('.mes').find('.mes_edit').trigger('click');
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index a4baaa901..98e811363 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -320,6 +320,7 @@ let power_user = {
     external_media_allowed_overrides: [],
     external_media_forbidden_overrides: [],
     pin_styles: true,
+    click_to_edit: false,
 };
 
 let themes = [];
@@ -1322,6 +1323,12 @@ function applyTheme(name) {
                 switchSwipeNumAllMessages();
             },
         },
+        {
+            key: 'click_to_edit',
+            action: () => {
+                $('#click_to_edit').prop('checked', power_user.click_to_edit);
+            },
+        },
     ];
 
     for (const { key, selector, type, action } of themeProperties) {
@@ -1452,6 +1459,10 @@ async function loadPowerUserSettings(settings, data) {
     const defaultStscript = JSON.parse(JSON.stringify(power_user.stscript));
     // Load from settings.json
     if (settings.power_user !== undefined) {
+        // Migrate old preference to a new setting
+        if (settings.power_user.click_to_edit === undefined && settings.power_user.chat_display === chat_styles.DOCUMENT) {
+            settings.power_user.click_to_edit = true;
+        }
         Object.assign(power_user, settings.power_user);
     }
 
@@ -1647,6 +1658,7 @@ async function loadPowerUserSettings(settings, data) {
     $('#auto-load-chat-checkbox').prop('checked', power_user.auto_load_chat);
     $('#forbid_external_media').prop('checked', power_user.forbid_external_media);
     $('#pin_styles').prop('checked', power_user.pin_styles);
+    $('#click_to_edit').prop('checked', power_user.click_to_edit);
 
     for (const theme of themes) {
         const option = document.createElement('option');
@@ -2379,6 +2391,7 @@ function getThemeObject(name) {
         reduced_motion: power_user.reduced_motion,
         compact_input_area: power_user.compact_input_area,
         show_swipe_num_all_messages: power_user.show_swipe_num_all_messages,
+        click_to_edit: power_user.click_to_edit,
     };
 }
 
@@ -3929,6 +3942,11 @@ $(document).ready(() => {
         applyStylePins();
     });
 
+    $('#click_to_edit').on('input', function () {
+        power_user.click_to_edit = !!$(this).prop('checked');
+        saveSettingsDebounced();
+    });
+
     $('#ui_preset_import_button').on('click', function () {
         $('#ui_preset_import_file').trigger('click');
     });