diff --git a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
index d6b67b9e0..1eef56855 100644
--- a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
@@ -70,9 +70,7 @@ class BTScanModel @Inject constructor(
                 }
 
                 // Include paired Bluetooth devices
-                ble.bondedDevices.forEach {
-                    addDevice(BLEDeviceListEntry(it))
-                }
+                ble.bondedDevices.map(::BLEDeviceListEntry).sortedBy { it.name }.forEach(::addDevice)
 
                 // Include Network Service Discovery
                 tcp.forEach { service ->
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 1cdba6206..22a7186f7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -365,11 +365,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         if (devices == null) return
 
         var hasShownOurDevice = false
-        devices.values
-            // Display the device list in alphabetical order while keeping the "None (Disabled)"
-            // device (fullAddress == n) at the top
-            .sortedBy { dle -> if (dle.fullAddress == "n") "0" else dle.name }
-            .forEach { device ->
+        devices.values.forEach { device ->
             if (device.fullAddress == scanModel.selectedNotNull) {
                 hasShownOurDevice = true
             }