diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/ClockSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/ClockSettings.qml
index 0a0a46d7f..b34e7efd8 100644
--- a/Modules/Panels/Settings/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/Panels/Settings/Bar/WidgetSettings/ClockSettings.qml
@@ -283,7 +283,7 @@ ColumnLayout {
 
   NDateTimeTokens {
     Layout.fillWidth: true
-    height: 200
+    Layout.preferredHeight: 300
 
     // Connect to token clicked signal if NDateTimeTokens provides it
     onTokenClicked: token => root.insertToken(token)
diff --git a/Widgets/NDateTimeTokens.qml b/Widgets/NDateTimeTokens.qml
index f1d5aab9c..340a767a1 100644
--- a/Widgets/NDateTimeTokens.qml
+++ b/Widgets/NDateTimeTokens.qml
@@ -21,11 +21,18 @@ Rectangle {
     anchors.margins: Style.marginS
     spacing: Style.marginS
 
-    NListView {
-      id: tokensList
+    Flickable {
       Layout.fillWidth: true
       Layout.fillHeight: true
-      model: [
+      contentHeight: tokensColumn.implicitHeight
+      clip: true
+
+      Column {
+        id: tokensColumn
+        width: parent.width
+
+        Repeater {
+          model: [
         // Common format combinations
         {
           "category": "Common",
@@ -201,7 +208,7 @@ Rectangle {
 
       delegate: Rectangle {
         id: tokenDelegate
-        width: tokensList.width
+        width: tokensColumn.width
         height: layout.implicitHeight + Style.marginS
         radius: Style.iRadiusS
         color: {
@@ -353,6 +360,8 @@ Rectangle {
           }
         }
       }
+      }
+    }
     }
   }