diff --git a/ChangeLog b/ChangeLog
index ff889fba5..a341ec5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	  note editing
 	- if you pressed both controls at the same time, the piano roll would 
 	  get stuck in selection mode (FIXED)
+	- shift drag on an unselected note didn't work (FIXED)
 
 2008-12-14	Andrew Kelley	<superjoe30/at/gmail/dot/com>
 
diff --git a/TODO b/TODO
index 40d1b1fda..fd5a4a969 100644
--- a/TODO
+++ b/TODO
@@ -60,6 +60,7 @@ Andrew Kelley's todo:
   * quick slice
   * look through FL Studio's tools and implement some of them
 - when looking at a piano roll, if the song is playing that pattern, move the position ticker to where it should be
+- slice tool for piano roll
 
 - recording automation
 - make knobs easier to tune (less sensitive)
diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index e298f8805..eb2a0b3f1 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -1435,6 +1435,14 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me )
 					
 					++it;
 				}
+				
+				// if clicked on an unselected note, remove selection
+				// and select that new note
+				if( ! m_currentNote->selected() )
+				{
+					clearSelectedNotes();
+					m_currentNote->setSelected( true );
+				}
 
 				
 				// clicked at the "tail" of the note?
@@ -1500,12 +1508,7 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me )
 				}
 				
 				
-				// if clicked on an unselected note, remove selection
-				if( ! m_currentNote->selected() )
-				{
-					clearSelectedNotes();
-					m_currentNote->setSelected( true );
-				}
+				
 				
 				engine::getSong()->setModified();
 			}