diff --git a/Tomboy/RecentChanges.cs b/Tomboy/RecentChanges.cs
index 264ef02..5f335be 100644
--- a/Tomboy/RecentChanges.cs
+++ b/Tomboy/RecentChanges.cs
@@ -347,7 +347,6 @@ namespace Tomboy
 			tree.ButtonReleaseEvent += OnTreeViewButtonReleased;
 			tree.DragDataGet += OnTreeViewDragDataGet;
 			tree.FocusInEvent += OnTreeViewFocused;
-			tree.FocusOutEvent += OnTreeViewFocusedOut;
 
 			tree.EnableModelDragSource (Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
 						    targets,
@@ -851,6 +850,7 @@ namespace Tomboy
 				tree.ActivateRow (path, column);
 				break;
 			case Gdk.EventType.ButtonPress:
+				Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = true;
 				if (args.Event.Button == 3) {
 					Gtk.Menu menu = Tomboy.ActionManager.GetWidget (
 						"/MainWindowContextMenu") as Gtk.Menu;
@@ -916,6 +916,11 @@ namespace Tomboy
 				OnOpenNote (this, args);
 				args.RetVal = true;
 				break;
+			
+			case Gdk.Key.Delete:
+				OnDeleteNote(this, args);
+				break;
+				
 			}
 		}
 
@@ -959,14 +964,6 @@ namespace Tomboy
 		// called when the user moves the focus into the notes TreeView
 		void OnTreeViewFocused (object sender, EventArgs args)
 		{
-			// enable the Delete Note option in the menu bar 
-			Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = true;
-		}
-		
-		// called when the focus moves out of the notes TreeView
-		void OnTreeViewFocusedOut (object sender, EventArgs args)
-		{
-			// Disable the Delete Note option in the menu bar (bug #647462)
 			Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = false;
 		}
 
