diff --git a/src/Views/input/input-checkboxes.phtml b/src/Views/input/input-checkboxes.phtml
index d1a06fcc..9c5c4eca 100644
--- a/src/Views/input/input-checkboxes.phtml
+++ b/src/Views/input/input-checkboxes.phtml
@@ -1,5 +1,4 @@
 <?php
-$id = uniqid();
 $label = isset($this->context->label) ? $this->context->label . ':' : '';
 $optionValuesDisabled = $this->context->optionValuesDisabled;
 $optionValuesEnabled = $this->context->optionValuesEnabled;
@@ -8,10 +7,15 @@ $optionNames = $this->context->optionNames;
 $optionStates = $this->context->optionStates;
 $keys = array_keys($optionNames);
 $inputClass = isset($this->context->inputClass) ? $this->context->inputClass : '';
+$ids = array_map('uniqid', $optionNames);
 ?>
 
 <div class="form-row">
-	<label for="<?= $id ?>">
+	<?php if (count($ids) == 1): ?>
+		<label for="<?= $ids[0] ?>">
+	<?php else: ?>
+		<label>
+	<?php endif ?>
 		<?= $label ?>
 	</label>
 	<div class="input-wrapper">
@@ -24,12 +28,10 @@ $inputClass = isset($this->context->inputClass) ? $this->context->inputClass : '
 				name="<?= $optionNames[$key] ?>"
 				value="<?= $optionValuesDisabled[$key] ?>"/>
 
-			<label class="checkbox-wrapper">
+			<label class="checkbox-wrapper" for="<?= $ids[$key] ?>">
 				<input type="checkbox"
+					id="<?= $ids[$key] ?>"
 					name="<?= $optionNames[$key] ?>"
-					<?php if (count($keys) == 1): ?>
-						id="<?= $id ?>"
-					<?php endif ?>
 					<?php if ($optionStates[$key]): ?>
 						checked="checked"
 					<?php endif ?>
diff --git a/src/Views/input/input-radioboxes.phtml b/src/Views/input/input-radioboxes.phtml
index aa1f03b0..d279d0be 100644
--- a/src/Views/input/input-radioboxes.phtml
+++ b/src/Views/input/input-radioboxes.phtml
@@ -1,5 +1,4 @@
 <?php
-$id = uniqid();
 $name = $this->context->name;
 $label = isset($this->context->label) ? $this->context->label . ':' : '';
 $optionValues = $this->context->optionValues;
@@ -7,24 +6,21 @@ $optionLabels = $this->context->optionLabels;
 $activeOptionValue = $this->context->activeOptionValue;
 $keys = array_keys($optionValues);
 $inputClass = isset($this->context->inputClass) ? $this->context->inputClass : '';
+$ids = array_map('uniqid', $optionValues);
 ?>
 
 <div class="form-row">
-	<label for="<?= $id ?>">
-		<?= $label ?>
-	</label>
+	<label><?= $label ?></label>
 	<div class="input-wrapper">
 
 		<?php foreach ($keys as $key): ?>
-			<label class="radiobox-wrapper">
+			<label class="radiobox-wrapper" for="<?= $ids[$key] ?>">
 				<input type="radio"
 					name="<?= $name ?>"
+					id="<?= $ids[$key] ?>"
 					<?php if ($inputClass): ?>
 						class="<?= $inputClass ?>"
 					<?php endif ?>
-					<?php if (count($keys) == 1): ?>
-						id="<?= $id ?>"
-					<?php endif ?>
 					<?php if ($optionValues[$key] == $activeOptionValue): ?>
 						checked="checked"
 					<?php endif ?>