3 files changed, 11 insertions, 2 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 8e2d9cf859..19ff6a60a3 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -869,7 +869,8 @@ sensitize_widgets (EventPage *epage)
 		gtk_widget_hide (priv->list_box);
 		gtk_widget_hide (priv->attendee_box);
 		gtk_widget_hide (priv->organizer);
-		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Cale_ndar:"));
+		gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Calendar:"));
+		gtk_label_set_mnemonic_widget ((GtkLabel *) priv->org_cal_label, priv->source_selector);
 	} else {
 		gtk_widget_show (priv->calendar_label);
 		gtk_widget_show (priv->list_box);
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index 860986ae14..95fffa2eb8 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -149,6 +149,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic_widget">organizer-entry</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -177,6 +178,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic_widget">start-time</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -746,7 +748,7 @@
 		      <child>
 			<widget class="GtkLabel" id="calendar-label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Cale_ndar:</property>
+			  <property name="label" translatable="yes">_Calendar:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 45021ad3f2..6d86eb6c6f 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1218,6 +1218,12 @@ e_week_view_focus (GtkWidget *widget, GtkDirectionType direction)
 		last_focus_span_num = week_view->editing_span_num;
 	}
 
+	/* if there is not event, just grab week_view */
+	if (week_view->events->len == 0) {
+		gtk_widget_grab_focus (widget);
+		return TRUE;
+	}
+
 	for (event_loop = 0; event_loop < week_view->events->len;
 	     ++event_loop) {
 		if (!e_week_view_get_next_tab_event (week_view, direction,