diff --git a/ChangeLog b/ChangeLog
index a0c401ebe12c781fa140fc50a78b7e94bd1b0e0c..1fc2d9631bc4374a9bcb215be1ded4c9757c0366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2008-01-12  Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+	* When changing the search method in the main window, put the input
+	  focus back to the text entry.
+
+
 2008-01-04  Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
 
-	* Add xfce4-popup-dict command to show the main window and/or grad the input
+	* Add xfce4-popup-dict command to show the main window and/or grab the input
 	  focus to the text field in the panel.
 	* Change year in copyright notes to 2008.
 
diff --git a/panel-plugin/dict.c b/panel-plugin/dict.c
index 5e220a20fd6457319509cdfba23fac3ad93cf9a2..15e9f759fc1b77446a87346a9d2c3330cfd6cf0c 100644
--- a/panel-plugin/dict.c
+++ b/panel-plugin/dict.c
@@ -1345,21 +1345,30 @@ static void dict_close_button_clicked(GtkWidget *button, DictData *dd)
 static void dict_search_mode_dict_toggled(GtkToggleButton *togglebutton, DictData *dd)
 {
 	if (gtk_toggle_button_get_active(togglebutton))
+	{
 		dd->mode = DICTMODE_DICT;
+		gtk_widget_grab_focus(dd->main_entry);
+	}
 }
 
 
 static void dict_search_mode_web_toggled(GtkToggleButton *togglebutton, DictData *dd)
 {
 	if (gtk_toggle_button_get_active(togglebutton))
+	{
 		dd->mode = DICTMODE_WEB;
+		gtk_widget_grab_focus(dd->main_entry);
+	}
 }
 
 
 static void dict_search_mode_spell_toggled(GtkToggleButton *togglebutton, DictData *dd)
 {
 	if (gtk_toggle_button_get_active(togglebutton))
+	{
 		dd->mode = DICTMODE_SPELL;
+		gtk_widget_grab_focus(dd->main_entry);
+	}
 }