diff --git a/src/resources/views/crud/fields/date_picker.blade.php b/src/resources/views/crud/fields/date_picker.blade.php
index f6101d9bcb..a278310931 100644
--- a/src/resources/views/crud/fields/date_picker.blade.php
+++ b/src/resources/views/crud/fields/date_picker.blade.php
@@ -69,7 +69,7 @@
 
         function bpFieldInitDatePickerElement(element) {
             var $fake = element,
-            $field = $fake.closest('.form-group').find('input[type="hidden"]'),
+                $field = $fake.closest('.input-group').parent().find('input[type="hidden"]'),
             $customConfig = $.extend({
                 format: 'dd/mm/yyyy'
             }, $fake.data('bs-datepicker'));
@@ -77,7 +77,7 @@ function bpFieldInitDatePickerElement(element) {
 
             var $existingVal = $field.val();
 
-                if( $existingVal.length ){
+                if( $existingVal && $existingVal.length ){
                     // Passing an ISO-8601 date string (YYYY-MM-DD) to the Date constructor results in
                     // varying behavior across browsers. Splitting and passing in parts of the date
                     // manually gives us more defined behavior.
diff --git a/src/resources/views/crud/fields/date_range.blade.php b/src/resources/views/crud/fields/date_range.blade.php
index bb5aa8fb04..c7bf02061c 100644
--- a/src/resources/views/crud/fields/date_range.blade.php
+++ b/src/resources/views/crud/fields/date_range.blade.php
@@ -81,8 +81,8 @@ function formatDate($entry, $dateFieldName)
     <script>
         function bpFieldInitDateRangeElement(element) {
                 var $visibleInput = element;
-                var $startInput = $visibleInput.closest('.form-group').find('.datepicker-range-start');
-                var $endInput = $visibleInput.closest('.form-group').find('.datepicker-range-end');
+                var $startInput = $visibleInput.closest('.input-group').parent().find('.datepicker-range-start');
+                var $endInput = $visibleInput.closest('.input-group').parent().find('.datepicker-range-end');
 
                 var $configuration = $visibleInput.data('bs-daterangepicker');
                 // set the startDate and endDate to the defaults
diff --git a/src/resources/views/crud/fields/datetime_picker.blade.php b/src/resources/views/crud/fields/datetime_picker.blade.php
index bfb0758743..5faf82420c 100644
--- a/src/resources/views/crud/fields/datetime_picker.blade.php
+++ b/src/resources/views/crud/fields/datetime_picker.blade.php
@@ -73,7 +73,7 @@
 
         function bpFieldInitDateTimePickerElement(element) {
                 var $fake = element,
-                $field = $fake.closest('.form-group').find('input[type="hidden"]'),
+                $field = $fake.closest('.input-group').parent().find('input[type="hidden"]'),
                 $customConfig = $.extend({
                     format: 'DD/MM/YYYY HH:mm',
                     defaultDate: $field.val(),