diff --git a/data/pref.xml b/data/pref.xml
index 90c74eefb..5f7300bf6 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -229,6 +229,7 @@
       <option id="rotation_algorithm" type="app::tools::RotationAlgorithm" default="app::tools::RotationAlgorithm::DEFAULT" />
       <option id="modify_selection_quantity" type="int" default="1" />
       <option id="modify_selection_brush" type="BrushType" default="BrushType::CIRCLE" />
+      <option id="doubleclick_select_tile" type="bool" default="true" />
     </section>
     <section id="quantization">
       <option id="with_alpha" type="bool" default="true" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index a40267d4b..bb8b31f2e 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -978,6 +978,7 @@ move_on_add_mode_tooltip = <<<END
 On "Add to selection" mode, we can move
 the selection when the mouse is inside it.
 END
+select_tile_with_double_click = Select a grid tile with double-click
 autotimeline = Show timeline automatically
 autotimeline_tooltip = <<<END
 Show the timeline automatically
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 7fa59221d..f7ea41586 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -176,6 +176,8 @@
           <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" />
+          <check text="@.select_tile_with_double_click" id="select_tile_with_double_click"
+		 pref="selection.doubleclick_select_tile" />
         </vbox>
 
         <!-- Timeline -->
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 1bda54bfb..5eddb6626 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -378,7 +378,8 @@ bool StandbyState::onDoubleClick(Editor* editor, MouseMessage* msg)
   tools::Ink* ink = editor->getCurrentEditorInk();
 
   // Select a tile with double-click
-  if (ink->isSelection()) {
+  if (ink->isSelection() &&
+      Preferences::instance().selection.doubleclickSelectTile()) {
     Command* selectTileCmd =
       Commands::instance()->byId(CommandId::SelectTile());