diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index f55613581..df43dbdcb 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -368,8 +368,10 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
 			data->setDevName(btDeviceSelectionDialog->getSelectedDeviceAddress());
 			data->setDevBluetoothName(btDeviceSelectionDialog->getSelectedDeviceName());
 		} else {
-			data->setDevName(qPrefDiveComputer::device());
-			data->setDevBluetoothName(qPrefDiveComputer::device_name());
+			QString name, address;
+			address = extractBluetoothNameAddress(ui.device->currentText(), name);
+			data->setDevName(address);
+			data->setDevBluetoothName(name);
 		}
 	} else
 		// this breaks an "else if" across lines... not happy...