diff --git a/data/gui.xml b/data/gui.xml
index 3dcd69ff4..19e157635 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -144,10 +144,10 @@
       </key>
       <key command="ToggleTilesMode" shortcut="Space+Tab" />
       <key command="TilesetMode" shortcut="Space+1">
-        <param name="mode" value="auto" />
+        <param name="mode" value="manual" />
       </key>
       <key command="TilesetMode" shortcut="Space+2">
-        <param name="mode" value="manual" />
+        <param name="mode" value="auto" />
       </key>
       <key command="TilesetMode" shortcut="Space+3">
         <param name="mode" value="stack" />
diff --git a/src/app/tileset_mode.h b/src/app/tileset_mode.h
index 442b6e816..ea2cd78c1 100644
--- a/src/app/tileset_mode.h
+++ b/src/app/tileset_mode.h
@@ -13,8 +13,8 @@ namespace app {
   // These modes are available edition modes for the tileset when an
   // tilemap is edited.
   enum class TilesetMode {
-    Auto,     // Add/remove tiles automatically when needed
     Manual,   // Modify existent tiles (don't create new ones)
+    Auto,     // Add/remove tiles automatically when needed
     Stack,    // Stack modified tiles as new ones
   };
 
diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index 244018ce2..48ea4d60b 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -187,12 +187,12 @@ ColorBar::ColorBar(int align, TooltipManager* tooltipManager)
   m_buttons.addItem(theme->parts.palOptions());
   m_tilesButton.addItem(theme->parts.tiles());
 
-  static_assert(0 == int(TilesetMode::Auto) &&
-                1 == int(TilesetMode::Manual) &&
+  static_assert(0 == int(TilesetMode::Manual) &&
+                1 == int(TilesetMode::Auto) &&
                 2 == int(TilesetMode::Stack), "Tileset mode buttons doesn't match TilesetMode enum values");
 
-  m_tilesetModeButtons.addItem(theme->parts.tilesAuto());
   m_tilesetModeButtons.addItem(theme->parts.tilesManual());
+  m_tilesetModeButtons.addItem(theme->parts.tilesAuto());
   m_tilesetModeButtons.addItem(theme->parts.tilesStack());
   setTilesetMode(m_tilesetMode);