diff --git a/src/ghtml-gtkhtml.c b/src/ghtml-gtkhtml.c
index 6eadc51..5140366 100644
--- a/src/ghtml-gtkhtml.c
+++ b/src/ghtml-gtkhtml.c
@@ -1179,18 +1179,18 @@ static gboolean _on_button_press_event(GtkWidget* widget,
 		menu = gtk_menu_new();
 		menuitem = gtk_image_menu_item_new_from_stock(
 				GTK_STOCK_GO_BACK, NULL);
-		g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(
-					on_back), surfer);
+		g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
+				G_CALLBACK(surfer_go_back), surfer);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 		menuitem = gtk_image_menu_item_new_from_stock(
 				GTK_STOCK_GO_FORWARD, NULL);
-		g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(
-					on_forward), surfer);
+		g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
+				G_CALLBACK(surfer_go_forward), surfer);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 		menuitem = gtk_image_menu_item_new_from_stock(
 				GTK_STOCK_REFRESH, NULL);
-		g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(
-					on_refresh), surfer);
+		g_signal_connect_swapped(G_OBJECT(menuitem), "activate",
+				G_CALLBACK(surfer_refresh), surfer);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 		gtk_widget_show_all(menu);
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,