diff --git a/Tomboy/RecentChanges.cs b/Tomboy/RecentChanges.cs
index fdca069..df6c147 100644
--- a/Tomboy/RecentChanges.cs
+++ b/Tomboy/RecentChanges.cs
@@ -320,6 +320,8 @@ namespace Tomboy
 			tree.MotionNotifyEvent += OnTreeViewMotionNotify;
 			tree.ButtonReleaseEvent += OnTreeViewButtonReleased;
 			tree.DragDataGet += OnTreeViewDragDataGet;
+			tree.FocusInEvent += OnTreeViewFocused;
+			tree.FocusOutEvent += OnTreeViewFocusedOut;
 
 			tree.EnableModelDragSource (Gdk.ModifierType.Button1Mask | Gdk.ModifierType.Button3Mask,
 						    targets,
@@ -847,6 +849,20 @@ namespace Tomboy
 				tree.Selection.SelectPath (path);
 			}
 		}
+		
+		// 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;
+		}
 
 		void PopupContextMenuAtLocation (Gtk.Menu menu, int x, int y)
 		{
