diff --git a/.gitignore b/.gitignore
index efeb6b6..efd7f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ doxygen/html
 *.lib
 *.exp
 *.pot
+*~
+
diff --git a/server/src/core/windows/start.c b/server/src/core/windows/start.c
index 036706b..5109805 100644
--- a/server/src/core/windows/start.c
+++ b/server/src/core/windows/start.c
@@ -32,6 +32,7 @@
 #include <lib3270/actions.h>
 #include <lib3270/properties.h>
 #include <lib3270/log.h>
+#include <lib3270/win32.h>
 #include <ipc-glib.h>
 
 void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUSED(**error)) {
@@ -72,6 +73,12 @@ void ipc3270_export_object(GObject *object, const char *name, GError G_GNUC_UNUS
 
 			g_message("Got session \"%c\"",id);
 
+			// Update registry
+			{
+				g_autofree gchar * session_name = g_strdup_printf("%s:%c",name,id);
+				lib3270_win32_set_string(PACKAGE_NAME,"last_session",session_name);
+			}
+
 			lib3270_set_session_id(ipc->hSession, id);
 
 			ipc->source->hPipe			= hPipe;
--
libgit2 0.21.2