diff --git a/static/v2/css/widgets/w_select_country.css b/static/v2/css/widgets/w_select_country.css
index cba15ce..e025ddc 100644
--- a/static/v2/css/widgets/w_select_country.css
+++ b/static/v2/css/widgets/w_select_country.css
@@ -54,6 +54,7 @@
     .w_select_country_content{
         position: absolute;
         top: var(--select-height);
+        z-index: 100;
         width: 100%;
         background: #FFFFFF;
         border: 2px solid var(--select-border);
diff --git a/static/v2/js/widgets/w_select_country.js b/static/v2/js/widgets/w_select_country.js
index 5861b9f..8a2952a 100644
--- a/static/v2/js/widgets/w_select_country.js
+++ b/static/v2/js/widgets/w_select_country.js
@@ -109,6 +109,7 @@ function connectCountryWDateRangePicker (el, data) {
     let datepicker_name = $parent.dataset.datepicker;
 
     let $datepicker = $(`.field_container[data-name="${datepicker_name}"]`)[0]
+    if (!$datepicker) return;
     daterangepickerInit($datepicker, false, data.now)
 }