diff --git a/ChangeLog b/ChangeLog
index 66de3342..afbe0a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
    src/prefs.c, src/dialogs.c, src/geanyentryaction.c,
    src/plugindata.h, src/vte.c, src/search.c, src/ui_utils.c:
    Make ui_entry_add_clear_icon() take a GtkEntry, not GtkWidget.
+ * src/keybindings.c:
+   Make 'Go to Line' keybinding focus the toolbar entry if visible.
 
 
 2009-09-20  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/src/keybindings.c b/src/keybindings.c
index 0e99f1be..ff4f5c82 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1833,8 +1833,16 @@ static void cb_func_goto_action(guint key_id)
 			navqueue_go_forward();
 			return;
 		case GEANY_KEYS_GOTO_LINE:
-			on_go_to_line_activate(NULL, NULL);
+		{
+			GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry");
+
+			/* use toolbar item if shown */
+			if (wid)
+				gtk_widget_grab_focus(wid);
+			else
+				on_go_to_line_activate(NULL, NULL);
 			return;
+		}
 		case GEANY_KEYS_GOTO_MATCHINGBRACE:
 			goto_matching_brace(doc);
 			return;