diff --git a/src/pw3270/common.h b/src/pw3270/common.h
index 6d90af4..705a9c2 100644
--- a/src/pw3270/common.h
+++ b/src/pw3270/common.h
@@ -58,8 +58,9 @@
 
 	// Configuration
 	LIB3270_EXPORT void		  pw3270_session_config_load(const gchar *filename);
+	LIB3270_EXPORT void		  pw3270_session_config_save();
 	LIB3270_EXPORT void		  pw3270_session_config_free(void);
-	LIB3270_EXPORT GKeyFile * pw3270_session_config_get(void);
+	LIB3270_EXPORT GKeyFile * pw3270_session_config_get(gboolean create);
 
 	gchar		* get_string_from_config(const gchar *group, const gchar *key, const gchar *def);
 	gboolean	  get_boolean_from_config(const gchar *group, const gchar *key, gboolean def);
diff --git a/src/pw3270/linux/config.c b/src/pw3270/linux/config.c
index 64d5c71..14416a9 100644
--- a/src/pw3270/linux/config.c
+++ b/src/pw3270/linux/config.c
@@ -265,9 +265,8 @@ void set_integer_to_config(const gchar *group, const gchar *key, gint val)
 
 }
 
-void pw3270_session_config_free(void)
+void pw3270_session_config_save()
 {
-
 	if(!keyfile)
 		return;
 
@@ -301,9 +300,13 @@ void pw3270_session_config_free(void)
 
 	}
 
+}
+
+void pw3270_session_config_free(void)
+{
+	pw3270_session_config_save();
 	g_key_file_free(keyfile);
 	keyfile = NULL;
-
 }
 
 gchar * build_data_filename(const gchar *first_element, ...)
@@ -361,9 +364,9 @@ gchar * filename_from_va(const gchar *first_element, va_list args)
 	return g_build_filename(".",suffix,NULL);
 }
 
-GKeyFile * pw3270_session_config_get(void)
+GKeyFile * pw3270_session_config_get(gboolean create)
 {
-	if(!keyfile)
+	if(!keyfile && create)
 		pw3270_session_config_load(NULL);
 	return keyfile;
 }
@@ -383,7 +386,7 @@ GKeyFile * pw3270_session_config_get(void)
 void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
 {
 	int			  f;
-	GKeyFile	* conf 	= pw3270_session_config_get();
+	GKeyFile	* conf 	= pw3270_session_config_get(TRUE);
 	gchar		* id	= g_strconcat(group,".",key,NULL);
 
 	for(f=0;f<G_N_ELEMENTS(WindowState);f++)
@@ -396,7 +399,7 @@ void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindow
 void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
 {
 	int 		  pos[2];
-	GKeyFile	* conf 	= pw3270_session_config_get();
+	GKeyFile	* conf 	= pw3270_session_config_get(TRUE);
 	gchar		* id	= g_strconcat(group,".",key,NULL);
 
 	gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
@@ -409,7 +412,7 @@ void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget 
 void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
 {
 	gchar		* id	= g_strconcat(group,".",key,NULL);
-	GKeyFile	* conf 	= pw3270_session_config_get();
+	GKeyFile	* conf 	= pw3270_session_config_get(TRUE);
 
 	if(g_key_file_has_key(conf,id,"size",NULL))
 	{
diff --git a/src/pw3270/linux/print.c b/src/pw3270/linux/print.c
index 4569581..1a3e4eb 100644
--- a/src/pw3270/linux/print.c
+++ b/src/pw3270/linux/print.c
@@ -48,7 +48,7 @@
 	g_message("Loading print settings");
 
 	// Load page and print settings
-	GKeyFile	* conf	= pw3270_session_config_get();
+	GKeyFile	* conf	= pw3270_session_config_get(TRUE);
 	GError		* err	= NULL;
 
 	debug("print_settings=%s",g_key_file_has_group(conf,"print_settings") ? "TRUE" : "FALSE");
@@ -128,7 +128,7 @@
     trace("%s(%p)",__FUNCTION__,operation);
 	g_message("Saving print settings");
 
-	GKeyFile * conf = pw3270_session_config_get();
+	GKeyFile * conf = pw3270_session_config_get(TRUE);
 	gtk_print_settings_to_key_file(settings,conf,"print_settings");
 	gtk_page_setup_to_key_file(pgsetup,conf,"page_setup");
 	gtk_paper_size_to_key_file(papersize,conf,"paper_size");
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index f7d0438..7cf1464 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
 					pw3270_session_config_load(argv[ix]);
 		}
 
-		pw3270_session_config_get();
+		pw3270_session_config_get(TRUE);
 
 	}
 
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 385e9c1..d73f04b 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -406,21 +406,25 @@ static GtkWidget * trace_window = NULL;
  {
  	debug("%s",__FUNCTION__);
 
-#ifdef ENABLE_WINDOWS_REGISTRY
+	GKeyFile * keyfile = pw3270_session_config_get(FALSE);
 
-	HKEY hKey;
-
-	if(get_registry_handle(NULL, &hKey, KEY_SET_VALUE))
+	if(keyfile)
 	{
-		v3270_to_registry(widget, hKey, "terminal");
-		RegCloseKey(hKey);
+		v3270_to_key_file(widget, keyfile, "terminal");
+		pw3270_session_config_save();
 	}
+#ifdef _WIN32
+	else
+	{
+		HKEY hKey;
 
-#else
-
-	v3270_to_key_file(widget, pw3270_session_config_get(), "terminal");
-
-#endif // _WIN32
+		if(get_registry_handle(NULL, &hKey, KEY_SET_VALUE))
+		{
+			v3270_to_registry(widget, hKey, "terminal");
+			RegCloseKey(hKey);
+		}
+	}
+#endif
 
  }
 
--
libgit2 0.21.2