diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 998b6582..84d343cf 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -17,12 +17,10 @@
   let current_runners = [];
   const handler = new DataHandler(current_runners, { rowsPerPage: 50 });
   const rows = handler.getRows();
-  $: sponsoring_contracts_show = current_runners.some(
-    (r) => r.selected === true
-  );
-  $: cards_show = current_runners.some((r) => r.selected === true);
-  $: certificates_show = current_runners.some((r) => r.selected === true);
-  $: generate_runners = current_runners.filter((r) => r.selected === true);
+  $: sponsoring_contracts_show = generate_runners.length > 0;
+  $: cards_show = generate_runners.length > 0;
+  $: certificates_show = generate_runners.length > 0;
+  $: generate_runners = []; //current_runners.filter((r) => r.selected === true);
   $: teams = [];
   $: orgs = [];
   $: mappedteams = teams.map(function (g) {
@@ -79,6 +77,13 @@
               <input
                 type="checkbox"
                 class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded"
+                on:click={() => {
+                  if (generate_runners.length != current_runners.length) {
+                    generate_runners = current_runners;
+                  } else {
+                    generate_runners = [];
+                  }
+                }}
               />
             </th>
             <Th {handler} orderBy="id">ID</Th>
@@ -107,6 +112,18 @@
                 <input
                   type="checkbox"
                   class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded"
+                  on:click={() => {
+                    if (
+                      generate_runners.findIndex((i) => i.id == row.id) == -1
+                    ) {
+                      generate_runners.push(row);
+                      generate_runners = generate_runners;
+                    } else {
+                      generate_runners = generate_runners.filter(
+                        (r) => r.id != row.id
+                      );
+                    }
+                  }}
                 />
               </td>
               <td>{row.id}</td>