diff --git a/documentation/examples/05-bindings/12-component-bindings/Keypad.svelte b/documentation/examples/05-bindings/12-component-bindings/Keypad.svelte
index c814a2238f..6d7f74d790 100644
--- a/documentation/examples/05-bindings/12-component-bindings/Keypad.svelte
+++ b/documentation/examples/05-bindings/12-component-bindings/Keypad.svelte
@@ -11,15 +11,9 @@
 </script>
 
 <div class="keypad">
-	<button on:click={select(1)}>1</button>
-	<button on:click={select(2)}>2</button>
-	<button on:click={select(3)}>3</button>
-	<button on:click={select(4)}>4</button>
-	<button on:click={select(5)}>5</button>
-	<button on:click={select(6)}>6</button>
-	<button on:click={select(7)}>7</button>
-	<button on:click={select(8)}>8</button>
-	<button on:click={select(9)}>9</button>
+	{#each Array(9) as _, i}
+		<button on:click={select(i + 1)}>{i + 1}</button>
+	{/each}
 
 	<button disabled={!value} on:click={clear}>clear</button>
 	<button on:click={select(0)}>0</button>
diff --git a/documentation/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte b/documentation/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte
index c814a2238f..6d7f74d790 100644
--- a/documentation/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte
+++ b/documentation/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte
@@ -11,15 +11,9 @@
 </script>
 
 <div class="keypad">
-	<button on:click={select(1)}>1</button>
-	<button on:click={select(2)}>2</button>
-	<button on:click={select(3)}>3</button>
-	<button on:click={select(4)}>4</button>
-	<button on:click={select(5)}>5</button>
-	<button on:click={select(6)}>6</button>
-	<button on:click={select(7)}>7</button>
-	<button on:click={select(8)}>8</button>
-	<button on:click={select(9)}>9</button>
+	{#each Array(9) as _, i}
+		<button on:click={select(i + 1)}>{i + 1}</button>
+	{/each}
 
 	<button disabled={!value} on:click={clear}>clear</button>
 	<button on:click={select(0)}>0</button>
diff --git a/documentation/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte b/documentation/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte
index c814a2238f..6d7f74d790 100644
--- a/documentation/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte
+++ b/documentation/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte
@@ -11,15 +11,9 @@
 </script>
 
 <div class="keypad">
-	<button on:click={select(1)}>1</button>
-	<button on:click={select(2)}>2</button>
-	<button on:click={select(3)}>3</button>
-	<button on:click={select(4)}>4</button>
-	<button on:click={select(5)}>5</button>
-	<button on:click={select(6)}>6</button>
-	<button on:click={select(7)}>7</button>
-	<button on:click={select(8)}>8</button>
-	<button on:click={select(9)}>9</button>
+	{#each Array(9) as _, i}
+		<button on:click={select(i + 1)}>{i + 1}</button>
+	{/each}
 
 	<button disabled={!value} on:click={clear}>clear</button>
 	<button on:click={select(0)}>0</button>