diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aaf07fb..36b0fc63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 #### Fixed
 
 * [#316](https://github.com/shlinkio/shlink-web-client/issues/316) Fixed manifest.json file not getting downloaded after passing credentials when the app is protected with basic auth.
+* [#311](https://github.com/shlinkio/shlink-web-client/issues/311) Fixed datepicker showing below other components.
 
 
 ## 2.6.0 - 2020-09-20
diff --git a/src/index.scss b/src/index.scss
index 209b5b70..b8243d0a 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -34,6 +34,10 @@ body,
   display: block !important;
 }
 
+.react-datepicker-popper {
+  z-index: 2;
+}
+
 .navbar-brand {
   @media (max-width: $smMax) {
     margin: 0 auto !important;