tidyverse · teunbrand · Sep 12, 2025 · Sep 12, 2025 · Sep 12, 2025
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,10 @@
 # ggplot2 (development version)
 
+### Bug fixes
+
+* Fixed regression where `draw_key_rect()` stopped using `fill` colours 
+  (@mitchelloharawild, #6609).
+
 # ggplot2 4.0.0
 
 ## User facing

diff --git a/R/legend-draw.R b/R/legend-draw.R
@@ -54,7 +54,7 @@ draw_key_abline <- function(data, params, size) {
 #' @export
 #' @rdname draw_key
 draw_key_rect <- function(data, params, size) {
-  colour <- if (is.na(data$fill %||% NA)) data$colour
+  colour <- if (is.na(data$fill %||% NA)) data$colour else data$fill
   rectGrob(gp = gg_par(
     col = NA,
     fill = fill_alpha(colour %||% "grey20", data$alpha),

diff --git a/tests/testthat/_snaps/legend-draw/all-legend-keys.svg b/tests/testthat/_snaps/legend-draw/all-legend-keys.svg