diff --git a/sdrbase/audio/audiodevicemanager.h b/sdrbase/audio/audiodevicemanager.h
index 6a69614e2..63b852dce 100644
--- a/sdrbase/audio/audiodevicemanager.h
+++ b/sdrbase/audio/audiodevicemanager.h
@@ -119,7 +119,6 @@ private:
     void deserializeOutputMap(QByteArray& data);
     void debugAudioOutputInfos() const;
 
-	friend class AudioDialog;
 	friend class MainSettings;
 };
 
diff --git a/sdrgui/gui/audiodialog.cpp b/sdrgui/gui/audiodialog.cpp
index 3f23ac45b..d5c9d9c2e 100644
--- a/sdrgui/gui/audiodialog.cpp
+++ b/sdrgui/gui/audiodialog.cpp
@@ -4,7 +4,7 @@
 #include <QTreeWidgetItem>
 #include "ui_audiodialog.h"
 
-AudioDialog::AudioDialog(AudioDeviceManager* audioDeviceManager, QWidget* parent) :
+AudioDialogX::AudioDialogX(AudioDeviceManager* audioDeviceManager, QWidget* parent) :
 	QDialog(parent),
 	ui(new Ui::AudioDialog),
 	m_audioDeviceManager(audioDeviceManager)
@@ -15,16 +15,18 @@ AudioDialog::AudioDialog(AudioDeviceManager* audioDeviceManager, QWidget* parent
 
 	// out panel
 
+	QAudioDeviceInfo defaultOutputDeviceInfo = QAudioDeviceInfo::defaultOutputDevice();
 	treeItem = new QTreeWidgetItem(ui->audioOutTree);
-	treeItem->setText(0, tr("Default (use first suitable device)"));
+	treeItem->setText(0, tr("System default output device"));
 
 	const QList<QAudioDeviceInfo>& outputDevices = m_audioDeviceManager->getOutputDevices();
 	i = 0;
 
     for(QList<QAudioDeviceInfo>::const_iterator it = outputDevices.begin(); it != outputDevices.end(); ++it)
     {
+        bool isDefaultDevice = it->deviceName() == defaultOutputDeviceInfo.deviceName();
         treeItem = new QTreeWidgetItem(ui->audioOutTree);
-        treeItem->setText(0, qPrintable(it->deviceName()));
+        treeItem->setText(0, it->deviceName() + (isDefaultDevice ? "(*)" : ""));
 
         if (i == 0)
         {
@@ -36,16 +38,18 @@ AudioDialog::AudioDialog(AudioDeviceManager* audioDeviceManager, QWidget* parent
 
     // in panel
 
+    QAudioDeviceInfo defaultInputDeviceInfo = QAudioDeviceInfo::defaultInputDevice();
     treeItem = new QTreeWidgetItem(ui->audioInTree);
-    treeItem->setText(0, tr("Default (use first suitable device)"));
+    treeItem->setText(0, tr("System default input device"));
 
     const QList<QAudioDeviceInfo>& inputDevices = m_audioDeviceManager->getInputDevices();
     i = 0;
 
     for(QList<QAudioDeviceInfo>::const_iterator it = inputDevices.begin(); it != inputDevices.end(); ++it)
     {
+        bool isDefaultDevice = it->deviceName() == defaultInputDeviceInfo.deviceName();
         treeItem = new QTreeWidgetItem(ui->audioInTree);
-        treeItem->setText(0, qPrintable(it->deviceName()));
+        treeItem->setText(0, it->deviceName() + (isDefaultDevice ? "(*)" : ""));
 
         if (i == 0)
         {
@@ -69,17 +73,17 @@ AudioDialog::AudioDialog(AudioDeviceManager* audioDeviceManager, QWidget* parent
 	ui->inputVolumeText->setText(QString("%1").arg(m_inputVolume, 0, 'f', 2));
 }
 
-AudioDialog::~AudioDialog()
+AudioDialogX::~AudioDialogX()
 {
 	delete ui;
 }
 
-void AudioDialog::accept()
+void AudioDialogX::accept()
 {
 	QDialog::accept();
 }
 
-void AudioDialog::on_inputVolume_valueChanged(int value)
+void AudioDialogX::on_inputVolume_valueChanged(int value)
 {
     m_inputVolume = (float) value / 100.0f;
     ui->inputVolumeText->setText(QString("%1").arg(m_inputVolume, 0, 'f', 2));
diff --git a/sdrgui/gui/audiodialog.h b/sdrgui/gui/audiodialog.h
index 7617ac089..68de9af7f 100644
--- a/sdrgui/gui/audiodialog.h
+++ b/sdrgui/gui/audiodialog.h
@@ -11,12 +11,12 @@ namespace Ui {
 	class AudioDialog;
 }
 
-class SDRGUI_API AudioDialog : public QDialog {
+class SDRGUI_API AudioDialogX : public QDialog {
 	Q_OBJECT
 
 public:
-	explicit AudioDialog(AudioDeviceManager* audioDeviceManager, QWidget* parent = 0);
-	~AudioDialog();
+	explicit AudioDialogX(AudioDeviceManager* audioDeviceManager, QWidget* parent = 0);
+	~AudioDialogX();
 
 private:
 	Ui::AudioDialog* ui;
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index eec04a498..dae1f235c 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -1414,7 +1414,7 @@ void MainWindow::on_action_Loaded_Plugins_triggered()
 
 void MainWindow::on_action_Audio_triggered()
 {
-	AudioDialog audioDialog(m_dspEngine->getAudioDeviceManager(), this);
+	AudioDialogX audioDialog(m_dspEngine->getAudioDeviceManager(), this);
 	audioDialog.exec();
 }