diff --git a/src/include/v3270/keyfile.h b/src/include/v3270/keyfile.h
index 5cfb598..aef1597 100644
--- a/src/include/v3270/keyfile.h
+++ b/src/include/v3270/keyfile.h
@@ -47,6 +47,7 @@
 
 	V3270KeyFile	* v3270_key_file_open(GtkWidget *terminal, const gchar *name, GError **error);
 	void			  v3270_key_file_close(GtkWidget *terminal);
+
 	void			  v3270_key_file_save(GtkWidget *terminal, GError **error);
 	void			  v3270_key_file_save_to_file(GtkWidget * terminal, const gchar *filename, GError **error);
 
diff --git a/src/objects/os/linux/savedesktopicon.c b/src/objects/os/linux/savedesktopicon.c
index bb1d604..61856f8 100644
--- a/src/objects/os/linux/savedesktopicon.c
+++ b/src/objects/os/linux/savedesktopicon.c
@@ -233,6 +233,17 @@ X-Desktop-File-Install-Version=0.23
 	// 1 = Shortcut filename
 	gtk_entry_set_text(GTK_ENTRY(inputs[1]),filename);
 
+	// 2 = Session name
+	{
+		gtk_widget_set_margin_top(GTK_WIDGET(inputs[2]),12);
+
+		const gchar * session_name = v3270_get_session_name(terminal);
+
+		if(strcmp(session_name,G_STRINGIFY(PRODUCT_NAME)))
+			gtk_entry_set_text(GTK_ENTRY(inputs[2]),session_name);
+
+	}
+
 	// 3 = Session filename
 	{
 		g_autofree gchar * session_filename = get_filename(terminal);
@@ -240,6 +251,7 @@ X-Desktop-File-Install-Version=0.23
 	}
 
 	// 4 = Generic name
+	gtk_widget_set_margin_top(GTK_WIDGET(inputs[4]),12);
 	gtk_entry_set_placeholder_text(GTK_ENTRY(inputs[4]),v3270_get_url(terminal));
 	gtk_entry_set_text(GTK_ENTRY(inputs[4]),v3270_get_url(terminal));
 	gtk_entry_set_input_hints(GTK_ENTRY(inputs[4]),GTK_INPUT_HINT_SPELLCHECK);
diff --git a/src/objects/window/keyfile.c b/src/objects/window/keyfile.c
index b156f56..6a08473 100644
--- a/src/objects/window/keyfile.c
+++ b/src/objects/window/keyfile.c
@@ -191,7 +191,7 @@ void v3270_key_file_close(GtkWidget *terminal) {
 
  void v3270_key_file_save_to_file(GtkWidget * terminal, const gchar *filename, GError **error) {
 
-	if(*error)
+	if(error && *error)
 		return;
 
 	V3270KeyFile * new_session = (V3270KeyFile *) g_malloc0(sizeof(struct _V3270KeyFile) + strlen(filename));
@@ -211,6 +211,9 @@ void v3270_key_file_close(GtkWidget *terminal) {
 
  void v3270_key_file_save(GtkWidget *terminal, GError **error) {
 
+	if(error && *error)
+		return;
+
 	V3270KeyFile *session = v3270_get_session_descriptor(terminal);
 
 	session->changed = FALSE;
diff --git a/src/objects/window/terminal.c b/src/objects/window/terminal.c
index 7ef75c9..094419b 100644
--- a/src/objects/window/terminal.c
+++ b/src/objects/window/terminal.c
@@ -54,7 +54,7 @@
  }
 
  static void save_settings(GtkWidget *terminal, gpointer G_GNUC_UNUSED(dunno)) {
-	v3270_key_file_save(terminal);
+	v3270_key_file_save(terminal,NULL);
  }
 
  static void print_done(GtkWidget *widget, GtkPrintOperation *operation, GtkPrintOperationResult result, gpointer G_GNUC_UNUSED(dunno)) {
--
libgit2 0.21.2