diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35c03d942e0..602abd98ea1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ### Fixed
 - The formatter for normalizing pages now also can treat ACM pages such as `2:1--2:33`.
 - Backslashes in content selectors are now corretly escaped. Fixes [#2426](https://github.com/JabRef/jabref/issues/2426).
+- Non-ISO timestamp settings prevented the opening of the entry editor (see [#2447](https://github.com/JabRef/jabref/issues/2447))
+
 
 ### Removed
 
diff --git a/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java b/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
index 30affabc6b7..33c421a6d90 100644
--- a/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
+++ b/src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
@@ -79,6 +79,9 @@ public JComponent getDatePicker() {
      * @param dateString
      */
     public void updateDatePickerDate(String dateString) {
+        // unregister DateChangeListener before update to prevent circular calls resulting in IllegalStateExceptions
+        datePicker.removeDateChangeListener(this);
+
         if(dateString!=null && !dateString.isEmpty()) {
             try {
                 datePicker.setDate(LocalDate.parse(dateString, dateTimeFormatter));
@@ -87,5 +90,7 @@ public void updateDatePickerDate(String dateString) {
                         + "Clear button in calender popup will not work.");
             }
         }
+
+        datePicker.addDateChangeListener(this);
     }
 }