diff --git a/src/core/track.cpp b/src/core/track.cpp
index a2d56a72f..5aa7a6be2 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -532,11 +532,6 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me )
 		}
 		return;
 	}
-	else if( _me->modifiers() & Qt::ShiftModifier )
-	{
-		// add/remove object to/from selection
-		selectableObject::mousePressEvent( _me );
-	}
 	else if( _me->button() == Qt::LeftButton &&
 			_me->modifiers() & Qt::ControlModifier )
 	{
@@ -593,13 +588,13 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me )
 		mouseMoveEvent( _me );
 		s_textFloat->show();
 	}
-	else if( _me->button() == Qt::MidButton )
+	else if( _me->button() == Qt::RightButton )
 	{
 		if( _me->modifiers() & Qt::ControlModifier )
 		{
 			m_tco->toggleMute();
 		}
-		else if( fixedTCOs() == false )
+		else if( _me->modifiers() & Qt::ShiftModifier && fixedTCOs() == false )
 		{
 			remove();
 		}
@@ -771,6 +766,11 @@ void trackContentObjectView::mouseReleaseEvent( QMouseEvent * _me )
  */
 void trackContentObjectView::contextMenuEvent( QContextMenuEvent * _cme )
 {
+	if( _cme->modifiers() )
+	{
+		return;
+	}
+
 	QMenu contextMenu( this );
 	if( fixedTCOs() == false )
 	{
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index e71479ad4..2cac87927 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -231,6 +231,11 @@ void SampleTCOView::updateSample()
 
 void SampleTCOView::contextMenuEvent( QContextMenuEvent * _cme )
 {
+	if( _cme->modifiers() )
+	{
+		return;
+	}
+
 	QMenu contextMenu( this );
 	if( fixedTCOs() == false )
 	{