diff --git a/src/libtomahawk/widgets/HistoryWidget.cpp b/src/libtomahawk/widgets/HistoryWidget.cpp
index 038bc626e..ef8809b0c 100644
--- a/src/libtomahawk/widgets/HistoryWidget.cpp
+++ b/src/libtomahawk/widgets/HistoryWidget.cpp
@@ -114,10 +114,14 @@ void
 HistoryWidget::onDateClicked( const QDate& date )
 {
     QDateEdit* cw = qobject_cast< QDateEdit* >( sender() );
-    if ( cw == m_calendarFrom )
+    if ( cw == m_calendarFrom && date > m_calendarTo->date())
     {
         m_calendarTo->setDate( date );
     }
+    if ( cw == m_calendarTo && date < m_calendarFrom->date())
+    {
+        m_calendarFrom->setDate( date );
+    }
 
     m_model->setLimit( 0 );
     m_model->setDateFrom( m_calendarFrom->date() );