diff --git a/jmetro/build.gradle b/jmetro/build.gradle
index 4c16bf7d..8f257009 100644
--- a/jmetro/build.gradle
+++ b/jmetro/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 sourceCompatibility = JavaVersion.VERSION_11
 
-version = '11.5.7'
+version = '11.5.8'
 def versionDescription = 'JMetro'
 
 javafx {
diff --git a/jmetro/src/main/resources/jfxtras/styles/jmetro/JMetroBase.css b/jmetro/src/main/resources/jfxtras/styles/jmetro/JMetroBase.css
index 778894ad..1feca01b 100644
--- a/jmetro/src/main/resources/jfxtras/styles/jmetro/JMetroBase.css
+++ b/jmetro/src/main/resources/jfxtras/styles/jmetro/JMetroBase.css
@@ -1327,6 +1327,9 @@
 }
 
 /***************************** Date Picker popup ********************************/
+.date-picker-popup .button {
+    -fx-skin: "javafx.scene.control.skin.ButtonSkin"; /* Without also specifying this an exception sometimes happens when opening the DatePicker for the second time */
+}
 
 .date-picker-popup {
     -fx-border-color: popup_border_color;