diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index a02b7ba0d..964e357d0 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -685,9 +685,12 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 		asw_layout->addWidget( audioWidget );
 		m_audioInterfaces->addItem( it.key() );
 	}
-	m_audioInterfaces->setCurrentIndex( m_audioInterfaces->findText(
-			ConfigManager::inst()->value( "mixer", "audiodev" ) ) );
-	m_audioIfaceSetupWidgets[Engine::mixer()->audioDevName()]->show();
+
+	QString audioDevName = 
+		ConfigManager::inst()->value( "mixer", "audiodev" );
+	m_audioInterfaces->
+		setCurrentIndex( m_audioInterfaces->findText( audioDevName ) );
+	m_audioIfaceSetupWidgets[audioDevName]->show();
 
 	connect( m_audioInterfaces, SIGNAL( activated( const QString & ) ),
 		this, SLOT( audioInterfaceChanged( const QString & ) ) );
@@ -766,9 +769,11 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 		m_midiInterfaces->addItem( it.key() );
 	}
 
-	m_midiInterfaces->setCurrentIndex( m_midiInterfaces->findText(
-		 ConfigManager::inst()->value( "mixer", "mididev" ) ) );
-	m_midiIfaceSetupWidgets[Engine::mixer()->midiClientName()]->show();
+	QString midiDevName = 
+		ConfigManager::inst()->value( "mixer", "mididev" );
+	m_midiInterfaces->setCurrentIndex( 
+		m_midiInterfaces->findText( midiDevName ) );
+	m_midiIfaceSetupWidgets[midiDevName]->show();
 
 	connect( m_midiInterfaces, SIGNAL( activated( const QString & ) ),
 		this, SLOT( midiInterfaceChanged( const QString & ) ) );
@@ -1373,5 +1378,3 @@ void SetupDialog::displayMIDIHelp()
 
 
 
-
-