diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp
index 8342b5e69..de8c7d536 100644
--- a/src/mumble/AudioWizard.cpp
+++ b/src/mumble/AudioWizard.cpp
@@ -62,8 +62,10 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
 	if (AudioInputRegistrar::qmNew) {
 		foreach(AudioInputRegistrar *air, *AudioInputRegistrar::qmNew) {
 			qcbInput->addItem(air->name);
-			if (air->name == AudioInputRegistrar::current)
+			if (air->name == AudioInputRegistrar::current) {
 				qcbInput->setCurrentIndex(qcbInput->count() - 1);
+				qcbEcho->setEnabled(air->canEcho(qcbOutput->currentText()));
+			}
 			QList<audioDevice> ql= air->getDeviceChoices();
 		}
 	}