diff --git a/data/pref.xml b/data/pref.xml
index 9bb855bdc..aa3e680c8 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -207,6 +207,7 @@
       <option id="opaque" type="bool" default="false" />
       <option id="auto_opaque" type="bool" default="true" />
       <option id="keep_selection_after_clear" type="bool" default="false" />
+      <option id="auto_show_selection_edges" type="bool" default="true" />
       <option id="transparent_color" type="app::Color" />
       <option id="rotation_algorithm" type="app::tools::RotationAlgorithm" default="app::tools::RotationAlgorithm::DEFAULT" />
       <option id="modify_selection_quantity" type="int" default="1" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index cd83ff874..a2ca13f9d 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -907,6 +907,11 @@ keep_selection_after_clear_tooltip = <<<END
 Check this if you want to keep the selection
 after deleting it.
 END
+auto_show_selection_edges = Automatically show selection edges after modifying the selection
+auto_show_selection_edges_tooltip = <<<END
+Uncheck this if you want to keep the
+selection edges option as you wish.
+END
 move_edges = Allow moving selection edges
 move_edges_tooltip = <<<END
 Check this if you want to be able to drag
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index c88f2d1f3..b4faa4fc7 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -136,6 +136,7 @@
           <separator text="@.editor_selection" horizontal="true" />
           <check text="@.auto_opaque" id="auto_opaque" tooltip="@.auto_opaque_tooltip" />
           <check text="@.keep_selection_after_clear" id="keep_selection_after_clear" tooltip="@.keep_selection_after_clear_tooltip" />
+          <check text="@.auto_show_selection_edges" id="auto_show_selection_edges" tooltip="@.auto_show_selection_edges_tooltip" />
           <check text="@.move_edges" id="move_edges" tooltip="@.move_edges_tooltip" />
           <check text="@.modifiers_disable_handles" id="modifiers_disable_handles" tooltip="@.modifiers_disable_handles_tooltip" />
           <check text="@.move_on_add_mode" id="move_on_add_mode" tooltip="@.move_on_add_mode_tooltip" />
diff --git a/src/app/commands/cmd_mask_all.cpp b/src/app/commands/cmd_mask_all.cpp
index 6c731b09c..772f0559c 100644
--- a/src/app/commands/cmd_mask_all.cpp
+++ b/src/app/commands/cmd_mask_all.cpp
@@ -56,8 +56,10 @@ void MaskAllCommand::onExecute(Context* context)
   document->resetTransformation();
   document->generateMaskBoundaries();
 
-  DocumentPreferences& docPref = Preferences::instance().document(document);
-  docPref.show.selectionEdges(true);
+  if (Preferences::instance().selection.autoShowSelectionEdges()) {
+    DocumentPreferences& docPref = Preferences::instance().document(document);
+    docPref.show.selectionEdges(true);
+  }
 
   update_screen_for_document(document);
 }
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index e84309d1e..8ef85d637 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -222,6 +222,9 @@ public:
     if (m_pref.selection.keepSelectionAfterClear())
       keepSelectionAfterClear()->setSelected(true);
 
+    if (m_pref.selection.autoShowSelectionEdges())
+      autoShowSelectionEdges()->setSelected(true);
+
     if (m_pref.selection.moveEdges())
       moveEdges()->setSelected(true);
 
@@ -451,6 +454,7 @@ public:
     m_pref.cursor.cursorScale(base::convert_to<int>(cursorScale()->getValue()));
     m_pref.selection.autoOpaque(autoOpaque()->isSelected());
     m_pref.selection.keepSelectionAfterClear(keepSelectionAfterClear()->isSelected());
+    m_pref.selection.autoShowSelectionEdges(autoShowSelectionEdges()->isSelected());
     m_pref.selection.moveEdges(moveEdges()->isSelected());
     m_pref.selection.modifiersDisableHandles(modifiersDisableHandles()->isSelected());
     m_pref.selection.moveOnAddMode(moveOnAddMode()->isSelected());
diff --git a/src/app/ui/editor/tool_loop_impl.cpp b/src/app/ui/editor/tool_loop_impl.cpp
index 80f6c5950..fb780406b 100644
--- a/src/app/ui/editor/tool_loop_impl.cpp
+++ b/src/app/ui/editor/tool_loop_impl.cpp
@@ -466,7 +466,8 @@ public:
         redraw = true;
 
         // Show selection edges
-        m_docPref.show.selectionEdges(true);
+        if (Preferences::instance().selection.autoShowSelectionEdges())
+          m_docPref.show.selectionEdges(true);
       }
       // Slice ink
       else if (getInk()->isSlice()) {