diff --git a/ChangeLog b/ChangeLog
index fdd532006..4d09c2462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
 	- added a note detuning tool
 	- fixed mouse cursor glitch when mousing over notes
 	- shift+drag didn't update beat+bassline (FIXED)
+	- if a different window was selected and you hold control and then
+	  click in the piano roll, it didn't do selection like it should (FIXED)
 	
 	* src/tracks/instrument_track.cpp:
 	fixed crash in processAudioBuffer when notePlayHandle was NULL
diff --git a/TODO b/TODO
index e96209be0..822d42567 100644
--- a/TODO
+++ b/TODO
@@ -52,7 +52,6 @@
 - add FLAC as export-format?
 
 Andrew Kelley's todo:
-- if a different window is selected and you hold control and then click in the piano roll, it doesn't do selection like it should
 - when looking at a piano roll, if the song is playing that pattern, move the position ticker to where it should be
 - multiview button - show notes from every instrument in the current beat+bassline with different colors
 - undo/redo for piano roll
diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index fab8d59df..1b8d54ee5 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -1271,6 +1271,16 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me )
 		noteUnderMouse()->editDetuningPattern();
 		return;
 	}
+	
+	// if holding control, go to selection mode
+	if( _me->modifiers() & Qt::ControlModifier && m_editMode != ModeSelect )
+	{
+		m_ctrlMode = m_editMode;
+		m_editMode = ModeSelect;
+		QApplication::changeOverrideCursor(
+										   QCursor( Qt::ArrowCursor ) );
+		update();
+	}	
 
 	// keep track of the point where the user clicked down
 	if( _me->button() == Qt::LeftButton )