diff --git a/ChangeLog b/ChangeLog
index 1ac6ada49..bc62fe263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,11 @@
 	* src/core/midi/midi_controller.cpp:
 	name midiControllers after their channel/controller
 
+	* src/gui/widgets/fader.cpp:
+	Use default context menu
 
+	* src/gui/controller_connection_dialog.cpp:
+	don't choose the controller if the user didn't actually choose anything
 
 2008-06-02	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp
index 0a7932ae2..d0ed828f4 100644
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -260,12 +260,16 @@ void controllerConnectionDialog::selectController( void )
 {
 	if( m_midiGroupBox->model()->value() > 0 )
 	{
-		m_controller = m_midiController->copyToMidiController(
-				engine::getSong() );
+		if( m_midiControllerSpinBox->model()->value() > 0 )
+		{
+			m_controller = m_midiController->copyToMidiController(
+					engine::getSong() );
+		}
 	}
 	else 
 	{
-		if( m_userGroupBox->model()->value() > 0 )
+		if( m_userGroupBox->model()->value() > 0 && 
+				engine::getSong()->controllers().size() )
 		{
 			m_controller = engine::getSong()->controllers().at( 
 					m_userController->model()->value() );
diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp
index c0b21ee71..38b944b86 100644
--- a/src/gui/widgets/fader.cpp
+++ b/src/gui/widgets/fader.cpp
@@ -89,10 +89,7 @@ void fader::contextMenuEvent( QContextMenuEvent * _ev )
 	if( !model()->nullTrack() )
 	{
 		captionMenu contextMenu( accessibleName() );
-		contextMenu.addAction( embed::getIconPixmap( "automation" ),
-					tr( "&Open in automation editor" ),
-					model()->getAutomationPattern(),
-					SLOT( openInAutomationEditor() ) );
+		addDefaultActions( &contextMenu );
 		contextMenu.exec( QCursor::pos() );
 		_ev->accept();
 	}