--- epiphany-2.14.2.1.orig/lib/widgets/ephy-location-entry.c	2006-01-29 22:47:22.000000000 +0100
+++ epiphany-browser-2.14.2.1/lib/widgets/ephy-location-entry.c	2006-07-10 00:10:35.086741200 +0200
@@ -377,6 +377,23 @@
 {
 	guint state = event->state & gtk_accelerator_get_default_mod_mask ();
 
+	if (event->keyval == GDK_Escape && state == 0)
+	{
+		ephy_location_entry_reset (lentry);
+		/* don't return TRUE since we want to cancel the autocompletion popup too */
+	}
+
+	return FALSE;
+}
+
+static gboolean
+entry_after_key_press_cb (GtkEntry *entry,
+			  GdkEventKey *event,
+			  EphyLocationEntry *lentry)
+{
+	guint state = event->state & gtk_accelerator_get_default_mod_mask ();
+	guchar *address;
+
 	if ((event->keyval == GDK_Return ||
 	     event->keyval == GDK_KP_Enter ||
 	     event->keyval == GDK_ISO_Enter) &&
@@ -387,15 +404,8 @@
 
 		g_signal_emit_by_name (entry, "activate");
 
-		return TRUE;
-	}
-
-	if (event->keyval == GDK_Escape && state == 0)
-	{
 		ephy_location_entry_reset (lentry);
-		/* don't return TRUE since we want to cancel the autocompletion popup too */
 	}
-
 	return FALSE;
 }
 
@@ -847,6 +859,8 @@
 			  G_CALLBACK (entry_populate_popup_cb), entry);
 	g_signal_connect (priv->icon_entry->entry, "key-press-event",
 			  G_CALLBACK (entry_key_press_cb), entry);
+	g_signal_connect_after (priv->icon_entry->entry, "key-press-event",
+				G_CALLBACK (entry_after_key_press_cb), entry);
 	g_signal_connect (priv->icon_entry->entry, "button-press-event",
 			  G_CALLBACK (entry_button_press_cb), entry);
 	g_signal_connect (priv->icon_entry->entry, "changed",
--- epiphany-2.14.2.1.orig/src/ephy-location-action.c	2006-01-29 22:47:21.000000000 +0100
+++ epiphany-browser-2.14.2.1/src/ephy-location-action.c	2006-07-10 00:03:58.749993544 +0200
@@ -137,7 +137,8 @@
 			(action->priv->bookmarks, smart_url, content);
 		g_return_if_fail (url != NULL);
 
-		ephy_link_open (EPHY_LINK (action), url, NULL, 0);
+		ephy_link_open (EPHY_LINK (action), url, NULL,
+				ephy_link_flags_from_current_event ());
 	
 		g_free (url);
 		g_free (content);
