=== modified file 'Tomboy/RecentChanges.cs'
--- Tomboy/RecentChanges.cs	2011-04-06 12:46:11 +0000
+++ Tomboy/RecentChanges.cs	2011-04-12 07:51:52 +0000
@@ -103,6 +103,7 @@
 			find_combo.Changed += OnEntryChanged;
 			find_combo.Entry.ActivatesDefault = false;
 			find_combo.Entry.Activated += OnEntryActivated;
+			find_combo.Entry.FocusInEvent += OnSearchBoxFocused;
 			if (previous_searches != null) {
 				foreach (string prev in previous_searches) {
 					find_combo.AppendText (prev);
@@ -764,6 +765,9 @@
 				tree.ActivateRow (path, column);
 				break;
 			case Gdk.EventType.ButtonPress:
+				// Enable the Delete Note option in the menu bar, which might have been
+				// disabled in case the focus was in the search combo box perviously.
+				Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = true;
 				if (args.Event.Button == 3) {
 					Gtk.Menu menu = Tomboy.ActionManager.GetWidget (
 						"/MainWindowContextMenu") as Gtk.Menu;
@@ -1172,6 +1176,13 @@
 			PerformSearch ();
 			AddToPreviousSearches (SearchText);
 		}
+		
+		// called when the user moves the focus in the search combo box
+		void OnSearchBoxFocused (object sender, EventArgs args)
+		{
+			// disable the Delete Note option in the menu bar (bug #647462)
+			Tomboy.ActionManager ["DeleteNoteAction"].Sensitive = false;
+		}
 
 		void AddToPreviousSearches (string text)
 		{

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-06 12:46:11 +0000
+++ debian/changelog	2011-04-12 07:51:52 +0000
@@ -1,3 +1,13 @@
+tomboy (1.6.0-0ubuntu2) natty; urgency=medium
+
+  * Added code for handling the FocusInEvent to the Search Combo box. It
+    disables the "Delete" option in the menu bar. 
+  * Also, added code for re-enabling the "Delete" option in the menu bar
+    when the user clicks back on the TreeView widget in the right pane.
+   (LP: #757635)
+
+ -- Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>  Tue, 12 Apr 2011 12:54:09 +0530
+
 tomboy (1.6.0-0ubuntu1) natty; urgency=low
 
   [ Rodrigo Moya ]