diff --git a/src/objects/application/actions/preferences.c b/src/objects/application/actions/preferences.c
index f094f56..cdde2d3 100644
--- a/src/objects/application/actions/preferences.c
+++ b/src/objects/application/actions/preferences.c
@@ -59,6 +59,7 @@
 		dialog
 	);
 
+
 	gtk_widget_show_all(dialog);
 
 	return dialog;
diff --git a/src/objects/settings/dialog.c b/src/objects/settings/dialog.c
index a5d5db1..af5eef0 100644
--- a/src/objects/settings/dialog.c
+++ b/src/objects/settings/dialog.c
@@ -197,6 +197,7 @@ void add(GtkContainer *container, GtkWidget *widget) {
 		settings->load(widget,settings->settings);
 	}
 
+	gtk_widget_show(widget);
 	gtk_notebook_append_page(
 		GTK_PW3270_SETTINGS_DIALOG(container)->tabs,
 		widget,
@@ -211,14 +212,10 @@ void page_changed(GtkNotebook *notebook, GtkWidget G_GNUC_UNUSED(*child), guint 
 
 void switch_page(GtkNotebook *notebook, PW3270Settings *page, guint G_GNUC_UNUSED(page_num), PW3270SettingsDialog *dialog) {
 
-	if(gtk_notebook_get_n_pages(notebook) > 1) {
-
-		GtkWidget * header_bar = gtk_dialog_get_header_bar(GTK_DIALOG(dialog));
-
-		if(header_bar) {
-			gtk_header_bar_set_subtitle(GTK_HEADER_BAR(header_bar),page->title);
-		}
+	GtkWidget * header_bar = gtk_dialog_get_header_bar(GTK_DIALOG(dialog));
 
+	if(header_bar) {
+		gtk_header_bar_set_subtitle(GTK_HEADER_BAR(header_bar),page->title);
 	}
 
 }
diff --git a/src/objects/window/header.c b/src/objects/window/header.c
index cb543c1..fd05818 100644
--- a/src/objects/window/header.c
+++ b/src/objects/window/header.c
@@ -112,6 +112,15 @@
 
  }
 
+ static GAction * get_action_from_name(GtkWidget *widget, const gchar *action_name) {
+
+	if(g_str_has_prefix(action_name,"app.")) {
+		return g_action_map_lookup_action(G_ACTION_MAP(g_application_get_default()),action_name+4);
+	}
+
+	return g_action_map_lookup_action(G_ACTION_MAP(widget),action_name+4);
+ }
+
  GtkWidget * pw3270_header_button_new_from_builder(GtkWidget *widget, GtkBuilder * builder, const gchar *action_name) {
 
 	GtkWidget * button = NULL;
@@ -127,45 +136,28 @@
 		gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(button), G_MENU_MODEL(gtk_builder_get_object(builder, action_name+5)));
 		gtk_widget_set_visible(button,TRUE);
 
-	} else if(g_str_has_prefix(action_name,"app.")) {
-
-		// It's an application action
-
-	} else if(g_str_has_prefix(action_name,"win.")) {
-
-		// It's a window action.
-		GAction * action = g_action_map_lookup_action(G_ACTION_MAP(widget),action_name+4);
-
-		if(action) {
-
-			button = gtk_button_new_from_action(action,GTK_ICON_SIZE_BUTTON);
 
-			gtk_actionable_set_action_name(GTK_ACTIONABLE(button),action_name);
-			gtk_widget_set_visible(button,g_action_get_enabled(action));
-
-
-		} else {
+	} else {
 
-			g_warning("Can't find action \"%s\"",action_name+4);
+		GAction * action = get_action_from_name(widget,action_name);
 
+		if(!action) {
+			g_warning("Can't find action %s",action_name);
 		}
 
-	}
-
-	if(button) {
+		button = gtk_button_new_from_action(action,GTK_ICON_SIZE_BUTTON);
 
-		g_signal_connect(button, "notify::sensitive", G_CALLBACK(on_sensitive), widget);
-		gtk_widget_set_focus_on_click(button,FALSE);
-		gtk_widget_set_can_focus(button,FALSE);
-		gtk_widget_set_can_default(button,FALSE);
-		gtk_widget_set_name(button,action_name);
-
-	} else {
-
-		g_warning("Can't create button for action \"%s\"",action_name);
+		gtk_actionable_set_action_name(GTK_ACTIONABLE(button),action_name);
+		gtk_widget_set_visible(button,g_action_get_enabled(action));
 
 	}
 
+	g_signal_connect(button, "notify::sensitive", G_CALLBACK(on_sensitive), widget);
+	gtk_widget_set_focus_on_click(button,FALSE);
+	gtk_widget_set_can_focus(button,FALSE);
+	gtk_widget_set_can_default(button,FALSE);
+	gtk_widget_set_name(button,action_name);
+
 	return button;
  }
 
diff --git a/src/objects/window/page.c b/src/objects/window/page.c
index 5b62d6c..a3c4653 100644
--- a/src/objects/window/page.c
+++ b/src/objects/window/page.c
@@ -303,30 +303,6 @@
 	// Show dialog.
 	gtk_widget_show_all(dialog);
 
-
-
- 	/*
-	GtkWidget * dialog = pw3270_settings_dialog_new(
-								_("Rename session"),
-								GTK_WINDOW(gtk_widget_get_toplevel(terminal))
-							);
-
-	// https://developer.gnome.org/hig/stable/visual-layout.html.en
-	gtk_container_set_border_width(GTK_CONTAINER(content),18);
-
-
-	gtk_widget_show_all(dialog);
-
-	if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY) {
-
-		v3270_set_session_name(terminal, gtk_entry_get_text(GTK_ENTRY(entry)));
-		g_signal_emit_by_name(terminal,"save-settings");
-
-	}
-
-	gtk_widget_destroy(dialog);
-	*/
-
  }
 
  static gboolean terminal_popup(GtkWidget *widget, gboolean selected, gboolean online, GdkEvent *event, pw3270ApplicationWindow * window) {
--
libgit2 0.21.2