diff --git a/src/objects/application/actions/open.c b/src/objects/application/actions/open.c
index 3f35490..87dee47 100644
--- a/src/objects/application/actions/open.c
+++ b/src/objects/application/actions/open.c
@@ -36,7 +36,103 @@
  #include <v3270.h>
  #include <pw3270.h>
  #include <pw3270/application.h>
+ #include <pw3270/actions.h>
 
+ static GtkWidget * session_dialog_new(PW3270Action *action, GtkApplication *application) {
+
+	GtkWidget *	dialog =
+		gtk_file_chooser_dialog_new(
+				action->label,
+				gtk_application_get_active_window(application),
+				GTK_FILE_CHOOSER_ACTION_OPEN,
+				_("Open Session"), GTK_RESPONSE_OK,
+				_("Cancel"),GTK_RESPONSE_CANCEL,
+				NULL
+		);
+
+	gtk_file_chooser_set_pw3270_filters(GTK_FILE_CHOOSER(dialog));
+	gtk_widget_show_all(dialog);
+
+	return dialog;
+ }
+
+ static void open_window(GtkWidget *dialog, gint response_id, GtkApplication *application) {
+
+ 	if(response_id == GTK_RESPONSE_OK) {
+
+		g_autofree gchar * file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+		if(file_name) {
+			GtkWidget *window = pw3270_application_window_new(application, file_name);
+			pw3270_window_set_current_page(window,0);
+			gtk_window_present(GTK_WINDOW(window));
+		}
+
+ 	}
+
+ 	gtk_widget_destroy(dialog);
+
+ }
+
+ static void open_tab(GtkWidget *dialog, gint response_id, GtkApplication *application) {
+
+ 	if(response_id == GTK_RESPONSE_OK) {
+
+		g_autofree gchar * file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+		if(file_name) {
+
+			pw3270_application_window_new_tab(GTK_WIDGET(gtk_application_get_active_window(GTK_APPLICATION(application))), file_name);
+
+		}
+
+ 	}
+
+ 	gtk_widget_destroy(dialog);
+
+ }
+
+ static GtkWidget * open_window_factory(PW3270Action *action, GtkApplication *application) {
+
+	GtkWidget * dialog = session_dialog_new(action,application);
+	g_signal_connect(dialog,"response",G_CALLBACK(open_window),application);
+	return dialog;
+
+ }
+
+ static GtkWidget * open_tab_factory(PW3270Action *action, GtkApplication *application) {
+
+	GtkWidget * dialog = session_dialog_new(action,application);
+	g_signal_connect(dialog,"response",G_CALLBACK(open_tab),application);
+	return dialog;
+
+ }
+
+ GAction * pw3270_open_window_action_new() {
+
+	PW3270Action * action = pw3270_dialog_action_new(open_window_factory);
+
+ 	action->name = "open.session.window";
+	action->label = _( "Open in window" );
+	action->tooltip = _( "Open session in New window" );
+	action->icon_name = "window-new";
+
+	return G_ACTION(action);
+ }
+
+ GAction * pw3270_open_tab_action_new() {
+
+	PW3270Action * action = pw3270_dialog_action_new(open_tab_factory);
+
+ 	action->name = "open.session.tab";
+	action->label = _( "Open in tab" );
+	action->tooltip = _( "Open session in New Tab" );
+	action->icon_name = "tab-new";
+
+	return G_ACTION(action);
+ }
+
+ /*
  static gchar * get_session_file_name(GtkApplication *application, const gchar *title) {
 
 	gchar * filename = NULL;
@@ -98,4 +194,5 @@
 
  	g_simple_action_set_enabled(action,TRUE);
  }
+ */
 
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index 162afcc..2045939 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -325,63 +325,14 @@
 
 	G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
 
-	/*
-	//
-	// Setup application default actions.
-	//
-	static GActionEntry actions[] = {
-
-		{
-			.name = "preferences",
-			.activate = pw3270_application_preferences_activated,
-		},
-
-		{
-			.name = "quit",
-			.activate = pw3270_application_quit_activated,
-		},
-
-		{
-			.name = "new.tab",
-			.activate = pw3270_application_new_tab_activated,
-		},
-
-		{
-			.name = "new.window",
-			.activate = pw3270_application_new_window_activated,
-		},
-
-		{
-			.name = "open.session",
-			.activate = pw3270_application_open_activated,
-		},
-
-		{
-			.name = "open.session.tab",
-			.activate = pw3270_application_open_tab_activated,
-		},
-
-		{
-			.name = "open.session.window",
-			.activate = pw3270_application_open_window_activated,
-		},
-
-	};
-
-	g_action_map_add_action_entries(
-		G_ACTION_MAP(application),
-		actions,
-		G_N_ELEMENTS(actions),
-		application
-	);
-	*/
-
 	GAction * actions[] = {
 		pw3270_about_action_new(),
 		pw3270_preferences_action_new(),
 		pw3270_new_tab_action_new(),
 		pw3270_new_window_action_new(),
-		pw3270_quit_action_new()
+		pw3270_quit_action_new(),
+		pw3270_open_window_action_new(),
+		pw3270_open_tab_action_new()
 	};
 
 	for(ix = 0; ix < G_N_ELEMENTS(actions); ix++) {
diff --git a/src/objects/application/private.h b/src/objects/application/private.h
index 5adad13..ea3c876 100644
--- a/src/objects/application/private.h
+++ b/src/objects/application/private.h
@@ -56,10 +56,9 @@
 	G_GNUC_INTERNAL GAction * pw3270_new_window_action_new();
 	G_GNUC_INTERNAL GAction * pw3270_quit_action_new();
 
-    G_GNUC_INTERNAL void pw3270_application_generic_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
+	G_GNUC_INTERNAL GAction * pw3270_open_window_action_new();
+	G_GNUC_INTERNAL GAction * pw3270_open_tab_action_new();
 
-    G_GNUC_INTERNAL void pw3270_application_open_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
-    G_GNUC_INTERNAL void pw3270_application_open_tab_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
-    G_GNUC_INTERNAL void pw3270_application_open_window_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
+    G_GNUC_INTERNAL void pw3270_application_generic_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
 
 #endif // PRIVATE_H_INCLUDED
--
libgit2 0.21.2