diff --git a/cosmic-applet-bluetooth/src/bluetooth.rs b/cosmic-applet-bluetooth/src/bluetooth.rs
index 5184aa6a..ab42a8ac 100644
--- a/cosmic-applet-bluetooth/src/bluetooth.rs
+++ b/cosmic-applet-bluetooth/src/bluetooth.rs
@@ -276,10 +276,9 @@ const DEFAULT_DEVICE_ICON: &str = "bluetooth-symbolic";
 impl BluerDevice {
     #[inline(never)]
     pub async fn from_device(device: &bluer::Device) -> Self {
-        let (mut name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
-            device
-                .name()
-                .map(|res| res.ok().flatten().unwrap_or(device.address().to_string())),
+        let (alias, name, is_paired, is_trusted, is_connected, battery_percent, icon) = futures::join!(
+            device.alias().map(|res| res.ok()),
+            device.name().map(|res| res.ok().flatten()),
             device.is_paired().map(Result::unwrap_or_default),
             device.is_trusted().map(Result::unwrap_or_default),
             device.is_connected().map(Result::unwrap_or_default),
@@ -288,10 +287,11 @@ impl BluerDevice {
                 .icon()
                 .map(|res| device_type_to_icon(&res.ok().flatten().unwrap_or_default()))
         );
-
-        if name.is_empty() {
-            name = device.address().to_string();
-        }
+        let address_string = device.address().to_string();
+        let name = alias
+            .filter(|name| !name.is_empty() && *name != address_string.replace(':', "-"))
+            .or(name.filter(|name| !name.is_empty()))
+            .unwrap_or(address_string);
 
         let status = if is_connected {
             BluerDeviceStatus::Connected