diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index fc1ac39e0..66a36221f 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -510,10 +510,13 @@ TilemapMode ColorBar::tilemapMode() const
                                  TilemapMode::Pixels;
 }
 
-void ColorBar::setTilemapMode(const TilemapMode mode)
+void ColorBar::setTilemapMode(TilemapMode mode)
 {
   const Site site = UIContext::instance()->activeSite();
   const bool isTilemap = (site.layer() && site.layer()->isTilemap());
+  if (!isTilemap)
+    mode = TilemapMode::Pixels;
+
   const bool editTiles = (mode == TilemapMode::Tiles);
 
   SkinTheme* theme = static_cast<SkinTheme*>(this->theme());
diff --git a/src/app/ui/color_bar.h b/src/app/ui/color_bar.h
index 1bcc257ce..bbd0635b7 100644
--- a/src/app/ui/color_bar.h
+++ b/src/app/ui/color_bar.h
@@ -89,7 +89,7 @@ namespace app {
     void setEditMode(bool state);
 
     TilemapMode tilemapMode() const;
-    void setTilemapMode(const TilemapMode mode);
+    void setTilemapMode(TilemapMode mode);
 
     TilesetMode tilesetMode() const;
     void setTilesetMode(const TilesetMode mode);