diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index 1908e1b3..8b276c88 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -251,6 +251,7 @@ Item {
     QtQuickControls2.Popup {
         id: popup
         padding: 0
+        closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
 
         Rectangle {
             id: calendarRect
diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml
index aefb5197..dca9ebe9 100644
--- a/components/StandardDropdown.qml
+++ b/components/StandardDropdown.qml
@@ -126,6 +126,7 @@ Item {
     Popup {
         id: popup
         padding: 0
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
         Rectangle {
             id: droplist