diff --git a/egui_extras/src/datepicker/button.rs b/egui_extras/src/datepicker/button.rs
index 0e8ca152..eaa47630 100644
--- a/egui_extras/src/datepicker/button.rs
+++ b/egui_extras/src/datepicker/button.rs
@@ -95,6 +95,10 @@ impl<'a> Widget for DatePickerButton<'a> {
             if pos.x + width_with_padding > ui.clip_rect().right() {
                 pos.x = button_response.rect.right() - width_with_padding;
             }
+
+            // Check to make sure the calendar never is displayed out of window
+            pos.x = pos.x.max(ui.style().spacing.window_margin.left);
+
             //TODO(elwerene): Better positioning
 
             let area_response = Area::new(ui.make_persistent_id(&self.id_source))