diff --git a/src/assets/views/utils/Field.svelte b/src/assets/views/utils/Field.svelte
index 8753433..9db50c8 100644
--- a/src/assets/views/utils/Field.svelte
+++ b/src/assets/views/utils/Field.svelte
@@ -45,9 +45,13 @@
         }
     }
 
-    function focusInput() {
+    function focusInput(e) {
         if (input) {
-            if (['file', 'checkbox', 'color'].indexOf(input.type) >= 0) {
+            if (input.type === 'checkbox') {
+                if (e.target !== label && e.target !== input) {
+                    input.click();
+                }
+            } else if (['file', 'color'].indexOf(input.type) >= 0) {
                 input.click();
             } else {
                 input.focus();
@@ -79,6 +83,7 @@
     }
 
     let input: HTMLInputElement;
+    let label: HTMLLabelElement;
 
     function chooseFile() {
         input.click();
@@ -440,7 +445,7 @@
 
             <div class="sections">
                 {#if type !== 'duration'}
-                    <label for={fieldId}>{@html placeholder || ''}
+                    <label for={fieldId} bind:this={label}>{@html placeholder || ''}
                         <slot/>
                     </label>
                 {/if}