diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c
index 31fbdf2..a7930c6 100644
--- a/src/dialogs/commondialog.c
+++ b/src/dialogs/commondialog.c
@@ -86,6 +86,11 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *titl
 	{
 		gtk_window_set_title(GTK_WINDOW(dialog), title);
 
+		gtk_box_set_spacing(
+			GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
+			18
+		);
+
 		gtk_dialog_add_buttons(
 			GTK_DIALOG (dialog),
 			_("_Cancel"), GTK_RESPONSE_CANCEL,
diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c
index 279424d..629a02b 100644
--- a/src/dialogs/hostselect.c
+++ b/src/dialogs/hostselect.c
@@ -119,7 +119,6 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
 	int f;
 
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
- 	gtk_container_set_border_width(GTK_CONTAINER(widget),18);
  	gtk_grid_set_row_spacing(GTK_GRID(widget),6);
  	gtk_grid_set_column_spacing(GTK_GRID(widget),12);
 
@@ -311,7 +310,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget)
 	}
 
 	GtkWidget * dialog	= v3270_host_select_new(widget);
-	GtkWidget * win	= v3270_dialog_new(widget, _("Configure host"), _("C_onnect"));
+	GtkWidget * win	= v3270_dialog_new(widget, _("Setup host"), _("C_onnect"));
 
 	gtk_window_set_default_size(GTK_WINDOW(win), 700, 150);
 
--
libgit2 0.21.2