1 files changed, 6 insertions, 0 deletions
diff --git a/mail/message-list.c b/mail/message-list.c
index ee80748e6f..2de21bf558 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -631,6 +631,12 @@ message_list_select(MessageList *ml, MessageListSelectDirection direction, guint
 	path = ml_search_path(ml, direction, flags, mask);
 	if (path) {
 		select_path(ml, path);
+
+		/* This function is usually called in response to a key
+		 * press, so grab focus if the message list is visible. */
+		if (gtk_widget_get_visible (GTK_WIDGET (ml)))
+			gtk_widget_grab_focus (GTK_WIDGET (ml));
+
 		return TRUE;
 	} else
 		return FALSE;