diff --git a/app/qml/pages/DeviceListPage.qml b/app/qml/pages/DeviceListPage.qml
index e86f4ce..96d9444 100644
--- a/app/qml/pages/DeviceListPage.qml
+++ b/app/qml/pages/DeviceListPage.qml
@@ -209,7 +209,7 @@ Page {
             SortFilterModel {
                 id: trustedDevicesModel
 
-                sortRole: "name"
+                sortRole: "section"
                 sourceModel: devicelistModel
             }
 
@@ -224,7 +224,7 @@ Page {
             ColumnView {
                 id: trustedDevices
                 width: page.width
-                itemHeight: Theme.itemSizeMedium
+                itemHeight: Theme.itemSizeMedium + (3 * Theme.itemSizeSmall / trustedDevices.count)
 
 
                 model: trustedDevicesModel