diff --git a/src/dialogs/settings/clipboard.c b/src/dialogs/settings/clipboard.c
index d49bc1d..9f1cf06 100644
--- a/src/dialogs/settings/clipboard.c
+++ b/src/dialogs/settings/clipboard.c
@@ -285,11 +285,11 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 	}
 
 	v3270_settings_create_toggle_buttons(toggles, G_N_ELEMENTS(toggles), grids, widget->input.toggles);
-	g_signal_connect(G_OBJECT(widget->input.toggles[1]),"toggled",G_CALLBACK(keep_selected_toggled),widget);
-
 	v3270_settings_create_combos(combos, G_N_ELEMENTS(combos), grids, widget->input.combos);
 	v3270_settings_create_checkboxes(checkboxes, G_N_ELEMENTS(checkboxes), grids, widget->input.checkboxes);
 
+	g_signal_connect(G_OBJECT(widget->input.toggles[1]),"toggled",G_CALLBACK(keep_selected_toggled),widget);
+
 	// Setup combos
 	{
 		GtkCellRenderer * text_renderer	= gtk_cell_renderer_text_new();
@@ -512,6 +512,8 @@ static void load(GtkWidget *w, GtkWidget *t) {
 
 	}
 
+	keep_selected_toggled(widget->input.toggles[1],widget);
+
 }
 
 static gchar get_active_id(V3270ClipboardSettings *widget, size_t combo) {
diff --git a/src/dialogs/settings/tools.c b/src/dialogs/settings/tools.c
index cf2515d..b7eb816 100644
--- a/src/dialogs/settings/tools.c
+++ b/src/dialogs/settings/tools.c
@@ -137,10 +137,10 @@
 
  	for(checkbox = 0; checkbox < length; checkbox++) {
 
-		buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(definitions[checkbox].label));
+		buttons[checkbox] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(g_dgettext(PACKAGE_NAME,definitions[checkbox].label)));
 
 		if(definitions[checkbox].tooltip)
-			gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),definitions[checkbox].tooltip);
+			gtk_widget_set_tooltip_text(GTK_WIDGET(buttons[checkbox]),g_dgettext(PACKAGE_NAME,definitions[checkbox].tooltip));
 
 		gtk_widget_set_halign(GTK_WIDGET(buttons[checkbox]),GTK_ALIGN_START);
 		gtk_grid_attach(GTK_GRID(grids[definitions[checkbox].grid]),GTK_WIDGET(buttons[checkbox]),definitions[checkbox].left,definitions[checkbox].top,definitions[checkbox].width,1);
--
libgit2 0.21.2