diff --git a/PyQt5/Qt5/qml/soloman/Controls/SDatePicker.qml b/PyQt5/Qt5/qml/soloman/Controls/SDatePicker.qml
index 6a01838..51d032a 100644
--- a/PyQt5/Qt5/qml/soloman/Controls/SDatePicker.qml
+++ b/PyQt5/Qt5/qml/soloman/Controls/SDatePicker.qml
@@ -43,7 +43,10 @@ Rectangle {
             text: control.selectedDate
             color: "transparent"
 
-            onClicked: popup.open()
+            onClicked: {
+                popup.x = this.x + popup.width > width ? width - popup.width : this.x
+                popup.open()
+            }
         }
     }
 
diff --git a/PyQt6/Qt6/qml/soloman/Controls/SDatePicker.qml b/PyQt6/Qt6/qml/soloman/Controls/SDatePicker.qml
index 6a01838..51d032a 100644
--- a/PyQt6/Qt6/qml/soloman/Controls/SDatePicker.qml
+++ b/PyQt6/Qt6/qml/soloman/Controls/SDatePicker.qml
@@ -43,7 +43,10 @@ Rectangle {
             text: control.selectedDate
             color: "transparent"
 
-            onClicked: popup.open()
+            onClicked: {
+                popup.x = this.x + popup.width > width ? width - popup.width : this.x
+                popup.open()
+            }
         }
     }
 
diff --git a/PySide2/qml/soloman/Controls/SDatePicker.qml b/PySide2/qml/soloman/Controls/SDatePicker.qml
index 6a01838..51d032a 100644
--- a/PySide2/qml/soloman/Controls/SDatePicker.qml
+++ b/PySide2/qml/soloman/Controls/SDatePicker.qml
@@ -43,7 +43,10 @@ Rectangle {
             text: control.selectedDate
             color: "transparent"
 
-            onClicked: popup.open()
+            onClicked: {
+                popup.x = this.x + popup.width > width ? width - popup.width : this.x
+                popup.open()
+            }
         }
     }
 
diff --git a/PySide6/qml/soloman/Controls/SDatePicker.qml b/PySide6/qml/soloman/Controls/SDatePicker.qml
index 6a01838..51d032a 100644
--- a/PySide6/qml/soloman/Controls/SDatePicker.qml
+++ b/PySide6/qml/soloman/Controls/SDatePicker.qml
@@ -43,7 +43,10 @@ Rectangle {
             text: control.selectedDate
             color: "transparent"
 
-            onClicked: popup.open()
+            onClicked: {
+                popup.x = this.x + popup.width > width ? width - popup.width : this.x
+                popup.open()
+            }
         }
     }