diff --git a/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt b/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt
new file mode 100644
index 0000000000..cfe4827af1
--- /dev/null
+++ b/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt
@@ -0,0 +1,6 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+ BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline
+ BlockContainer
at (8,8) content-size 784x100 children: not-inline
+ Box at (8,8) content-size 100x100 [GFC] children: not-inline
+ BlockContainer at (8,8) content-size 500x100 [BFC] children: not-inline
+ BlockContainer at (8,8) content-size 500x100 children: not-inline
diff --git a/Tests/LibWeb/Layout/input/grid/column-auto-auto.html b/Tests/LibWeb/Layout/input/grid/column-auto-auto.html
new file mode 100644
index 0000000000..7749189255
--- /dev/null
+++ b/Tests/LibWeb/Layout/input/grid/column-auto-auto.html
@@ -0,0 +1,17 @@
+
\ No newline at end of file
diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
index 4b252a3a38..03805a6642 100644
--- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
@@ -728,6 +728,11 @@ void GridFormattingContext::resolve_intrinsic_track_sizes(AvailableSpace const&
}
}
+ if (grid_items_of_track.size() == 0) {
+ ++index;
+ continue;
+ }
+
if (!track.min_track_sizing_function.is_intrinsic_track_sizing() && !track.max_track_sizing_function.is_intrinsic_track_sizing()) {
++index;
continue;