diff --git a/changelog/82_UNRELEASED_xxxx-xx-xx.md b/changelog/82_UNRELEASED_xxxx-xx-xx.md
index 69beeae6..c291467d 100644
--- a/changelog/82_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/82_UNRELEASED_xxxx-xx-xx.md
@@ -50,7 +50,7 @@
 
 ### General
 
-- Optimized that date time picker shortcuts (e.g. the "Never overdue" checkbox) are now also accessible via keyboard navigation (using `Tab`)
+- xxx
 
 ### API
 
diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php
index 1b1fff17..12f60bfc 100644
--- a/views/components/datetimepicker.blade.php
+++ b/views/components/datetimepicker.blade.php
@@ -76,7 +76,8 @@
 					id="datetimepicker-shortcut"
 					name="datetimepicker-shortcut"
 					value="1"
-					data-datetimepicker-shortcut-value="{{ $shortcutValue }}">
+					data-datetimepicker-shortcut-value="{{ $shortcutValue }}"
+					tabindex="-1">
 				<label class="form-check-label custom-control-label"
 					for="datetimepicker-shortcut">{{ $__t($shortcutLabel) }}
 				</label>
diff --git a/views/components/datetimepicker2.blade.php b/views/components/datetimepicker2.blade.php
index 095a42d2..9a760316 100644
--- a/views/components/datetimepicker2.blade.php
+++ b/views/components/datetimepicker2.blade.php
@@ -76,7 +76,8 @@
 					id="datetimepicker2-shortcut"
 					name="datetimepicker2-shortcut"
 					value="1"
-					data-datetimepicker2-shortcut-value="{{ $shortcutValue }}">
+					data-datetimepicker2-shortcut-value="{{ $shortcutValue }}"
+					tabindex="-1">
 				<label class="form-check-label custom-control-label"
 					for="datetimepicker2-shortcut">{{ $__t($shortcutLabel) }}
 				</label>