diff --git a/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx b/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx
index b4bc8be..33db247 100644
--- a/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx
+++ b/openecomp-ui/src/nfvo-components/datepicker/Datepicker.jsx
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import React from 'react';
 import PropTypes from 'prop-types';
 import DatePicker from 'react-datepicker';
@@ -97,8 +112,21 @@
                             placeholderText={placeholderText}
                         />
                     }
-                    minDate={selectsEnd && props.startDate}
-                    maxDate={selectsStart && props.endDate}
+                    minDate={
+                        selectsEnd && props.startDate
+                            ? props.startDate
+                            : undefined
+                    }
+                    maxDate={
+                        selectsStart && props.endDate
+                            ? props.endDate
+                            : undefined
+                    }
+                    popperModifiers={{
+                        preventOverflow: {
+                            boundariesElement: 'scrollParent'
+                        }
+                    }}
                     {...props}
                 />
             </div>