diff --git a/R/plot_central.R b/R/plot_central.R
index 9ebee1f..b79b738 100644
--- a/R/plot_central.R
+++ b/R/plot_central.R
@@ -249,8 +249,8 @@ NULL
             }
         }
         plot_out <- .resolve_plot_colours(
-            plot_out, object$colour_by, colour_by, fill = point_out$fill,
-            colour = !point_out$fill, do_bin = !is.null(bins)
+            plot_out, object$colour_by, colour_by, fill = !is.null(fill_by) || point_out$fill,
+            colour = !is.null(colour_by), do_bin = !is.null(bins)
         )
     }
 
diff --git a/R/plot_colours.R b/R/plot_colours.R
index 25c7655..2caae24 100644
--- a/R/plot_colours.R
+++ b/R/plot_colours.R
@@ -45,7 +45,6 @@
     }
     # Picking whether to fill or not.
     aesthetics <- c("fill", "colour")[c(fill, colour)]
-
     if (fill) {
         VIRIDFUN <- scale_fill_viridis
         SCALEFUN <- scale_fill_manual