diff --git a/.gitignore b/.gitignore
index 0512fc3df..2adb3b20b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ Specfile
 .anjuta_sym_db.db
 gtk-glade/version_date.h
 share/linphone.desktop
+share/audio-assistant.desktop
 Debug/
 build/macos/Info-linphone.plist
 coreapi/help/Doxyfile
diff --git a/configure.ac b/configure.ac
index c38507fa4..786cb6287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -900,6 +900,7 @@ AC_CONFIG_FILES([
 	share/xml/Makefile
 	share/linphone.pc
 	share/linphone.desktop
+	share/audio-assistant.desktop
 	scripts/Makefile
 	tools/Makefile
 	linphone.spec
diff --git a/gtk/audio_assistant.c b/gtk/audio_assistant.c
index 1e5bbddeb..431fa9995 100644
--- a/gtk/audio_assistant.c
+++ b/gtk/audio_assistant.c
@@ -407,10 +407,14 @@ static void prepare(GtkAssistant *w){
 
 void linphone_gtk_close_audio_assistant(GtkWidget *w){
 	gchar *path = g_object_get_data(G_OBJECT(audio_assistant),"path");
-	g_unlink(path);
+	if(path != NULL){
+		g_unlink(path);
+	}
 	gtk_widget_destroy(w);
+	if(linphone_gtk_get_audio_assistant_option()){
+		gtk_main_quit();
+	}
 	audio_assistant = NULL;
-	linphone_gtk_show_main_window();
 }
 
 void linphone_gtk_audio_assistant_apply(GtkWidget *w){
diff --git a/gtk/linphone.h b/gtk/linphone.h
index 910981a53..2a256cab5 100644
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -189,6 +189,7 @@ gchar *linphone_gtk_get_record_path(const LinphoneAddress *address, gboolean is_
 void linphone_gtk_schedule_restart(void);
 
 void linphone_gtk_show_audio_assistant(void);
+gboolean linphone_gtk_get_audio_assistant_option(void);
 
 void linphone_gtk_set_configuration_uri(void);
 GtkWidget * linphone_gtk_show_config_fetching(void);
diff --git a/gtk/main.c b/gtk/main.c
index 347abafce..2fd3fd897 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -271,6 +271,10 @@ void linphone_gtk_schedule_restart(void){
 	restart=TRUE;
 }
 
+gboolean linphone_gtk_get_audio_assistant_option(void){
+	return run_audio_assistant;
+}
+
 static void linphone_gtk_init_liblinphone(const char *config_file,
 		const char *factory_config_file, const char *db_file) {
 	LinphoneCoreVTable vtable={0};
diff --git a/share/Makefile.am b/share/Makefile.am
index 63f15dfe4..f0df44261 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -23,7 +23,7 @@ ring_DATA=$(LINPHONE_RINGS)
 
 #to be compliant with freedesktop.org:
 linphone_fddir= $(datadir)/applications
-linphone_fd_DATA= linphone.desktop
+linphone_fd_DATA= linphone.desktop audio-assistant.desktop
 
 
 pkgconfigdir=$(libdir)/pkgconfig
@@ -43,9 +43,10 @@ rootca.pem:
 		cp -f $(srcdir)/archived-rootca.pem $(builddir)/rootca.pem ; \
 	fi
 
-EXTRA_DIST = 					$(LINPHONE_SOUNDS) \
+EXTRA_DIST =					$(LINPHONE_SOUNDS) \
 						$(LINPHONE_RINGS) \
-					        linphone.desktop.in   \
+						linphone.desktop.in   \
+						audio-assistant.desktop.in   \
 						linphone.pc.in \
 						Makefile.inc \
 						archived-rootca.pem
diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in
new file mode 100644
index 000000000..5e164ca2b
--- /dev/null
+++ b/share/audio-assistant.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Audio assistant
+Comment=Linphone audio assistant
+Comment[fr]=Assistant audio de Linphone.
+Type=Application
+Exec=linphone --run-audio-assistant
+Icon=/usr/local/share/pixmaps/linphone/linphone.png
+Terminal=false
+Categories=Network;Telephony;
\ No newline at end of file