diff --git a/Tomboy/RecentChanges.cs b/Tomboy/RecentChanges.cs
index 72707a5..ca21e87 100644
--- a/Tomboy/RecentChanges.cs
+++ b/Tomboy/RecentChanges.cs
@@ -103,6 +103,8 @@ namespace Tomboy
 			find_combo.Changed += OnEntryChanged;
 			find_combo.Entry.ActivatesDefault = false;
 			find_combo.Entry.Activated += OnEntryActivated;
+			find_combo.KeyReleaseEvent += OnKeyReleaseFindCombo;
+			
 			if (previous_searches != null) {
 				foreach (string prev in previous_searches) {
 					find_combo.AppendText (prev);
@@ -1152,7 +1154,32 @@ namespace Tomboy
 				find.SearchText = SearchText;
 			}
 		}
-
+		
+		/// <summary>
+		/// Puts focus to the Notes Tree if the Return Key is pressed
+		/// </summary>
+		/// <remarks>
+		/// 	This change also addresses Bug #512175
+		/// </remarks>
+		/// <param name="sender">
+		/// A <see cref="System.Object"/>
+		/// </param>
+		/// <param name="args">
+		/// A <see cref="Gtk.KeyReleaseEventArgs"/>
+		/// </param>
+		void OnKeyReleaseFindCombo (object sender, Gtk.KeyReleaseEventArgs args)
+		{
+			Gtk.TreeIter iter;
+			tree.Model.GetIterFirst (out iter);
+			switch (args.Event.Key) {
+			case Gdk.Key.Return:
+				Logger.Debug ("Activating First Row in Notes Tree");
+				tree.Selection.SelectIter (iter);
+				tree.GrabFocus ();
+				break;
+			}
+		}
+		
 		void OnEntryActivated (object sender, EventArgs args)
 		{
 			if (entry_changed_timeout != null)
