diff --git a/stepmania/Themes/default/Sounds/ScreenEdit AddNote.redir b/stepmania/Themes/default/Sounds/ScreenEdit AddNote.redir
new file mode 100644
index 0000000000..e8a638a791
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenEdit AddNote.redir	
@@ -0,0 +1 @@
+_silent
diff --git a/stepmania/Themes/default/Sounds/ScreenEdit RemoveNote.redir b/stepmania/Themes/default/Sounds/ScreenEdit RemoveNote.redir
new file mode 100644
index 0000000000..e8a638a791
--- /dev/null
+++ b/stepmania/Themes/default/Sounds/ScreenEdit RemoveNote.redir	
@@ -0,0 +1 @@
+_silent
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index bc3344fa74..0fdda81e76 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -578,6 +578,8 @@ void ScreenEdit::Init()
 	this->SortByDrawOrder();
 
 
+	m_soundAddNote.Load(		THEME->GetPathS("ScreenEdit","AddNote"), true );
+	m_soundRemoveNote.Load(	THEME->GetPathS("ScreenEdit","RemoveNote"), true );
 	m_soundChangeLine.Load( THEME->GetPathS("ScreenEdit","line"), true );
 	m_soundChangeSnap.Load( THEME->GetPathS("ScreenEdit","snap"), true );
 	m_soundMarker.Load(		THEME->GetPathS("ScreenEdit","marker"), true );
@@ -835,23 +837,21 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 				break;
 
 			// check for to see if the user intended to remove a HoldNote
+			int iHeadRow;
+			if( m_NoteDataEdit.IsHoldNoteAtBeat( iCol, iSongIndex, &iHeadRow ) )
 			{
-				int iHeadRow;
-				if( m_NoteDataEdit.IsHoldNoteAtBeat( iCol, iSongIndex, &iHeadRow ) )
-				{
-					m_NoteDataEdit.SetTapNote( iCol, iHeadRow, TAP_EMPTY );
-					return;
-				}
+				m_NoteDataEdit.SetTapNote( iCol, iHeadRow, TAP_EMPTY );
+				m_soundRemoveNote.Play();
 			}
-
-			if( m_NoteDataEdit.GetTapNote(iCol, iSongIndex).type != TapNote::empty )
+			else if( m_NoteDataEdit.GetTapNote(iCol, iSongIndex).type != TapNote::empty )
 			{
 				m_NoteDataEdit.SetTapNote( iCol, iSongIndex, TAP_EMPTY );
-				return;
+				m_soundRemoveNote.Play();
 			}
 			else if( EditIsBeingPressed(EDIT_BUTTON_LAY_MINE) )
 			{
 				m_NoteDataEdit.SetTapNote(iCol, iSongIndex, TAP_ORIGINAL_MINE );
+				m_soundAddNote.Play();
 			}
 			else if( EditIsBeingPressed(EDIT_BUTTON_LAY_ATTACK) )
 			{
@@ -861,6 +861,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 			else
 			{
 				m_NoteDataEdit.SetTapNote(iCol, iSongIndex, TAP_ORIGINAL_TAP );
+				m_soundAddNote.Play();
 			}
 		}
 		break;
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 62d0a1f89d..ace40589f5 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -171,6 +171,8 @@ protected:
 
 	NoteData			m_Clipboard;
 
+	RageSound			m_soundAddNote;
+	RageSound			m_soundRemoveNote;
 	RageSound			m_soundChangeLine;
 	RageSound			m_soundChangeSnap;
 	RageSound			m_soundMarker;