diff --git a/src/core/song.cpp b/src/core/song.cpp
index 8fdd01b5d..f278162ea 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -1013,7 +1013,8 @@ void song::saveControllerStates( QDomDocument & _doc, QDomElement & _this )
 void song::restoreControllerStates( const QDomElement & _this )
 {
 	QDomNode node = _this.firstChild();
-	while( !node.isNull() ) {
+	while( !node.isNull() )
+	{
 		addController( controller::create( node.toElement(), this ) );
 
 		node = node.nextSibling();
diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp
index 6d412072b..0a7932ae2 100644
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -146,7 +146,7 @@ controllerConnectionDialog::controllerConnectionDialog( QWidget * _parent,
 	m_midiControllerSpinBox->move( 72, 24 );
 	
 
-	ledCheckBox * m_midiAutoDetectCheckBox =
+	m_midiAutoDetectCheckBox =
 			new ledCheckBox( tr("Auto Detect"),
 				m_midiGroupBox, tr("Auto Detect") );
 	m_midiAutoDetectCheckBox->setModel( &m_midiAutoDetect );
@@ -236,6 +236,9 @@ controllerConnectionDialog::controllerConnectionDialog( QWidget * _parent,
 			}
 		}
 	}
+	else {
+		m_midiGroupBox->model()->setValue( TRUE );
+	}
 
 
 	show();
@@ -303,7 +306,7 @@ void controllerConnectionDialog::midiToggled( void )
 
 	m_midiChannelSpinBox->setEnabled( enabled );
 	m_midiControllerSpinBox->setEnabled( enabled );
-	//m_midiAutoDetect->setEnabled( enabled );
+	m_midiAutoDetectCheckBox->setEnabled( enabled );
 }