--- epiphany-2.16.1/src/ephy-find-toolbar.c	2006-09-13 06:48:50.000000000 -0500
+++ epiphany-2.16.1d/src/ephy-find-toolbar.c	2006-11-03 19:13:41.000000000 -0500
@@ -25,6 +25,7 @@
 #include "ephy-embed-find.h"
 #include "ephy-embed-factory.h"
 #include "ephy-debug.h"
+#include "ephy-gui.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
@@ -257,7 +258,7 @@
 	{
 		handled = ephy_embed_find_activate_link (get_find (toolbar), event->state);
 	}
-
+	
 	return handled;
 }
 
@@ -283,16 +284,26 @@
 	      EphyFindToolbar *toolbar)
 {
 	GtkWidget *wtoolbar = GTK_WIDGET (toolbar);
-
+	guint button = (guint) -1;
+	
 	while (widget != NULL && widget != wtoolbar)
 	{
 		widget = widget->parent;
 	}
 
+	ephy_gui_get_current_event (NULL, NULL, &button);
+	
 	/* if widget == toolbar, the new focus widget is in the toolbar */
 	if (widget != wtoolbar)
 	{
-		ephy_find_toolbar_request_close (toolbar);
+		if (button != 2)
+		{
+			ephy_find_toolbar_request_close (toolbar);
+		}
+		else
+		{
+			gtk_widget_grab_focus (GTK_WIDGET (toolbar));
+		}
 	}
 }
 
