diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp
index 28405ea14..2d5bf56a7 100644
--- a/plugins/datetime/datetimeplugin.cpp
+++ b/plugins/datetime/datetimeplugin.cpp
@@ -113,7 +113,10 @@ void DatetimePlugin::updateCurrentTimeString()
 {
     const QDateTime currentDateTime = QDateTime::currentDateTime();
 
-    m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss"));
+    if (m_centralWidget->is24HourFormat())
+        m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss"));
+    else
+        m_dateTipsLabel->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" hh:mm:ss A"));
 
     const QString currentString = currentDateTime.toString("mm");
 
diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp
index 77309ad78..64817bfa0 100644
--- a/plugins/datetime/datetimewidget.cpp
+++ b/plugins/datetime/datetimewidget.cpp
@@ -52,8 +52,10 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
 
     if (displayMode == Dock::Efficient)
     {
+        const QString text = current.toString(m_24HourFormat ? "hh:mm" : "hh:mm A");
+
         painter.setPen(Qt::white);
-        painter.drawText(rect(), Qt::AlignCenter, current.toString(m_24HourFormat ? "hh:mm" : "hh:mm A"));
+        painter.drawText(rect(), Qt::AlignCenter, text.left(5));
         return;
     }