diff --git a/R/plot_grid.R b/R/plot_grid.R
index 2501762..064ad00 100644
--- a/R/plot_grid.R
+++ b/R/plot_grid.R
@@ -177,8 +177,11 @@ plot_grid <- function(..., plotlist = NULL, align = c("none", "h", "v", "hv"),
   if (is.null(cols)) cols <- ceiling(num_plots/rows)
   if (is.null(rows)) rows <- ceiling(num_plots/cols)
 
-  # if the user wants to layout the plots by column, we use the calculated rows to reorder plots
-  if (!isTRUE(byrow)) plots <- plots[c(t(matrix(c(1:num_plots, rep(NA, (rows * cols) - num_plots)), nrow = rows, byrow = FALSE)))]
+  # if the user wants to layout the plots by column, we use the calculated rows to reorder plots and labels
+  if (!isTRUE(byrow)){
+    plots <- plots[c(t(matrix(c(1:num_plots, rep(NA, (rows * cols) - num_plots)), nrow = rows, byrow = FALSE)))]
+    labels <- labels[c(t(matrix(c(1:num_plots, rep(NA, (rows * cols) - num_plots)), nrow = rows, byrow = FALSE)))]
+  }
 
   # Align the plots (if specified)
   grobs <- align_plots(plotlist = plots, align = align, axis = axis, greedy = greedy)
diff --git a/tests/figs/plot-grid/byrow-is-false.svg b/tests/figs/plot-grid/byrow-is-false.svg
new file mode 100644
index 0000000..e60104e
--- /dev/null
+++ b/tests/figs/plot-grid/byrow-is-false.svg
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' class='svglite' data-engine-version='2.0' width='720.00pt' height='576.00pt' viewBox='0 0 720.00 576.00'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA='>
+    <rect x='0.00' y='0.00' width='720.00' height='576.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHwzNjAuMDB8MC4wMHwyODguMDA='>
+    <rect x='0.00' y='0.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHwzNjAuMDB8MC4wMHwyODguMDA=)'>
+<rect x='0.00' y='0.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTQuNTJ8NS40OHwyODIuNTI='>
+    <rect x='5.48' y='5.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTQuNTJ8NS40OHwyODIuNTI=)'>
+<rect x='5.48' y='5.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='3.89' y='14.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>1</text>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcyMC4wMHwwLjAwfDI4OC4wMA=='>
+    <rect x='360.00' y='0.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcyMC4wMHwwLjAwfDI4OC4wMA==)'>
+<rect x='360.00' y='0.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzY1LjQ4fDcxNC41Mnw1LjQ4fDI4Mi41Mg=='>
+    <rect x='365.48' y='5.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzY1LjQ4fDcxNC41Mnw1LjQ4fDI4Mi41Mg==)'>
+<rect x='365.48' y='5.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='363.89' y='14.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>3</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHwzNjAuMDB8Mjg4LjAwfDU3Ni4wMA=='>
+    <rect x='0.00' y='288.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHwzNjAuMDB8Mjg4LjAwfDU3Ni4wMA==)'>
+<rect x='0.00' y='288.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTQuNTJ8MjkzLjQ4fDU3MC41Mg=='>
+    <rect x='5.48' y='293.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTQuNTJ8MjkzLjQ4fDU3MC41Mg==)'>
+<rect x='5.48' y='293.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='3.89' y='302.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>2</text>
+</g>
+</svg>
diff --git a/tests/figs/plot-grid/byrow-is-true.svg b/tests/figs/plot-grid/byrow-is-true.svg
new file mode 100644
index 0000000..d268743
--- /dev/null
+++ b/tests/figs/plot-grid/byrow-is-true.svg
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' class='svglite' data-engine-version='2.0' width='720.00pt' height='576.00pt' viewBox='0 0 720.00 576.00'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA='>
+    <rect x='0.00' y='0.00' width='720.00' height='576.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHwzNjAuMDB8MC4wMHwyODguMDA='>
+    <rect x='0.00' y='0.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHwzNjAuMDB8MC4wMHwyODguMDA=)'>
+<rect x='0.00' y='0.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTQuNTJ8NS40OHwyODIuNTI='>
+    <rect x='5.48' y='5.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTQuNTJ8NS40OHwyODIuNTI=)'>
+<rect x='5.48' y='5.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='3.89' y='14.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>1</text>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcyMC4wMHwwLjAwfDI4OC4wMA=='>
+    <rect x='360.00' y='0.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcyMC4wMHwwLjAwfDI4OC4wMA==)'>
+<rect x='360.00' y='0.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzY1LjQ4fDcxNC41Mnw1LjQ4fDI4Mi41Mg=='>
+    <rect x='365.48' y='5.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzY1LjQ4fDcxNC41Mnw1LjQ4fDI4Mi41Mg==)'>
+<rect x='365.48' y='5.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='363.89' y='14.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>2</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHwzNjAuMDB8Mjg4LjAwfDU3Ni4wMA=='>
+    <rect x='0.00' y='288.00' width='360.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHwzNjAuMDB8Mjg4LjAwfDU3Ni4wMA==)'>
+<rect x='0.00' y='288.00' width='360.00' height='288.00' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTQuNTJ8MjkzLjQ4fDU3MC41Mg=='>
+    <rect x='5.48' y='293.48' width='349.04' height='277.04' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTQuNTJ8MjkzLjQ4fDU3MC41Mg==)'>
+<rect x='5.48' y='293.48' width='349.04' height='277.04' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='3.89' y='302.45' style='font-size: 14.00px; font-weight: bold; font-family: sans;' textLength='7.79px' lengthAdjust='spacingAndGlyphs'>3</text>
+</g>
+</svg>
diff --git a/tests/testthat/test_plot_grid.R b/tests/testthat/test_plot_grid.R
index 18d5546..7063e14 100644
--- a/tests/testthat/test_plot_grid.R
+++ b/tests/testthat/test_plot_grid.R
@@ -98,3 +98,18 @@ test_that("alignment", {
     plot_grid(p1, p2, ncol = 1, align = 'v', axis = "rl") + theme_map()
   )
 })
+
+
+
+test_that("labels reorder by byrow", {
+
+  p_list <- lapply(1:3, \(x) ggplot())
+
+  expect_doppelganger("byrow is TRUE",
+    plot_grid(plotlist = p_list, ncol = 2, labels = 1:3, byrow = TRUE)
+  )
+
+  expect_doppelganger("byrow is FALSE",
+    plot_grid(plotlist = p_list, ncol = 2, labels = 1:3, byrow = FALSE)
+  )
+})