diff --git a/An2WinFileTransfer/An2WinFileTransfer/Services/DeviceService.cs b/An2WinFileTransfer/An2WinFileTransfer/Services/DeviceService.cs
index 47e71ca..d6ba54d 100644
--- a/An2WinFileTransfer/An2WinFileTransfer/Services/DeviceService.cs
+++ b/An2WinFileTransfer/An2WinFileTransfer/Services/DeviceService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using An2WinFileTransfer.Extensions;
 using MediaDevices;
 
 namespace An2WinFileTransfer.Services
@@ -16,12 +17,12 @@ public DeviceService()
 
         public IEnumerable<string> GetConnectedDeviceNames()
         {
-            return _mediaDevices.Select(d => d.FriendlyName);
+            return _mediaDevices.Select(d => d.FriendlyName.IsNullOrEmpty() ? d.Description : d.FriendlyName);
         }
 
         public MediaDevice ConnectToDevice(string deviceName)
         {
-            var device = _mediaDevices.FirstOrDefault(d => d.FriendlyName == deviceName);
+            var device = _mediaDevices.FirstOrDefault(d => d.FriendlyName == deviceName || d.Description == deviceName);
 
             if (device == null)
             {