diff --git a/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor b/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor
new file mode 100644
index 0000000..c517f41
--- /dev/null
+++ b/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor
@@ -0,0 +1,9 @@
+@typeparam TItem
+@{
+    int i = 0;
+    foreach (TItem value in In ?? Enumerable.Empty<TItem>())
+    {
+        var item = new ValueWithIndex<TItem>(value!, i++);
+        @ChildContent!(item);
+    }
+}
\ No newline at end of file
diff --git a/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor.cs b/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor.cs
new file mode 100644
index 0000000..cb85dd3
--- /dev/null
+++ b/Source/Lib/Morris.Blazor.ControlFlow/ForEachWithIndex.razor.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Components;
+using System.Collections.Generic;
+
+namespace Morris.Blazor.ControlFlow;
+
+public partial class ForEachWithIndex<TItem>
+{
+#if NET6_0_OR_GREATER
+	[EditorRequired]
+#endif
+	[Parameter] public IEnumerable<TItem>? In { get; set; }
+#if NET6_0_OR_GREATER
+	[EditorRequired]
+#endif
+	[Parameter] public RenderFragment<ValueWithIndex<TItem>>? ChildContent { get; set; }
+}
diff --git a/Source/Lib/Morris.Blazor.ControlFlow/ValueWithIndex.cs b/Source/Lib/Morris.Blazor.ControlFlow/ValueWithIndex.cs
new file mode 100644
index 0000000..cbcb2b2
--- /dev/null
+++ b/Source/Lib/Morris.Blazor.ControlFlow/ValueWithIndex.cs
@@ -0,0 +1,13 @@
+namespace Morris.Blazor.ControlFlow;
+
+public readonly struct ValueWithIndex<T>
+{
+	public T Value { get; } = default!;
+	public int Index { get; } = 0;
+
+	public ValueWithIndex(T value, int index)
+	{
+		Index = index;
+		Value = value;
+	}
+}
diff --git a/Source/Tutorials/ForEachExample/Pages/FetchData.razor b/Source/Tutorials/ForEachExample/Pages/FetchData.razor
index 9d60730..6bd7adb 100644
--- a/Source/Tutorials/ForEachExample/Pages/FetchData.razor
+++ b/Source/Tutorials/ForEachExample/Pages/FetchData.razor
@@ -7,39 +7,62 @@
 
 <p>This component demonstrates fetching data from a service.</p>
 
-@if (forecasts == null)
-{
-	<p><em>Loading...</em></p>
-}
-else
-{
-	<table class="table">
-		<thead>
-			<tr>
-				<th>Date</th>
-				<th>Temp. (C)</th>
-				<th>Temp. (F)</th>
-				<th>Summary</th>
-			</tr>
-		</thead>
-		<tbody>
-			<ForEach Context=forecast In=@forecasts>
-				<tr>
-					<td>@forecast.Date.ToShortDateString()</td>
-					<td>@forecast.TemperatureC</td>
-					<td>@forecast.TemperatureF</td>
-					<td>@forecast.Summary</td>
-				</tr>
-			</ForEach>
-		</tbody>
-	</table>
-}
+<If Condition=@(forecasts is null)>
+    <Then>
+        <p><em>Loading...</em></p>
+    </Then>
+    <Else>
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Temp. (C)</th>
+                    <th>Temp. (F)</th>
+                    <th>Summary</th>
+                </tr>
+            </thead>
+            <tbody>
+                <ForEach Context=forecast In=@forecasts>
+                    <tr>
+                        <td>@forecast.Date.ToShortDateString()</td>
+                        <td>@forecast.TemperatureC</td>
+                        <td>@forecast.TemperatureF</td>
+                        <td>@forecast.Summary</td>
+                    </tr>
+                </ForEach>
+            </tbody>
+        </table>
+        <hr />
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Index</th>
+                    <th>Date</th>
+                    <th>Temp. (C)</th>
+                    <th>Temp. (F)</th>
+                    <th>Summary</th>
+                </tr>
+            </thead>
+            <tbody>
+                <ForEachWithIndex Context=item In=@forecasts>
+                    <tr>
+                        <td>@item.Index</td>
+                        <td>@item.Value.Date.ToShortDateString()</td>
+                        <td>@item.Value.TemperatureC</td>
+                        <td>@item.Value.TemperatureF</td>
+                        <td>@item.Value.Summary</td>
+                    </tr>
+                </ForEachWithIndex>
+            </tbody>
+        </table>
+    </Else>
+</If>
 
 @code {
-	private WeatherForecast[] forecasts;
+    private WeatherForecast[] forecasts;
 
-	protected override async Task OnInitializedAsync()
-	{
-		forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
-	}
+    protected override async Task OnInitializedAsync()
+    {
+        forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
+    }
 }