diff --git a/src/g_editor.c b/src/g_editor.c
index 0469067937ca02e1120ce4c8e0742d453f0f0d00..df59c3923d9712542ce689134458650c6da5597c 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -3346,6 +3346,19 @@ static t_glist *glist_finddirty(t_glist *x)
     return (0);
 }
 
+void canvas_menuclose(t_canvas *x, t_floatarg fforce);
+/* properly close all open root canvases */
+void glob_closeall(void*dummy, t_floatarg fforce)
+{
+  t_canvas*x, *y;
+  for (x = canvas_list; x; )
+    {
+      y=x->gl_next;
+      canvas_menuclose(x, fforce); /* forced closing of this root canvas */
+      x=y;
+    }
+}
+
     /* quit, after calling glist_finddirty() on all toplevels and verifying
     the user really wants to discard changes  */
 void glob_verifyquit(void *dummy, t_floatarg f)
@@ -3579,6 +3592,9 @@ static void canvas_find_parent(t_canvas *x)
 {
     if (x->gl_owner)
         canvas_vis(glist_getcanvas(x->gl_owner), 1);
+	else {
+		sys_gui("menu_raise_console;\n");
+	}
 }
 
 static int glist_dofinderror(t_glist *gl, void *error_object)
diff --git a/src/s_inter.c b/src/s_inter.c
index d9c83cffe369419d43bf75a90cb4f45794b55f1c..6cd666aaf3c76050715eb2ac69bae8322e6871d9 100644
--- a/src/s_inter.c
+++ b/src/s_inter.c
@@ -1311,8 +1311,9 @@ void sys_bail(int n)
     else _exit(1);
 }
 
-extern t_pd *garray_arraytemplatecanvas;
-extern t_pd *garray_floattemplatecanvas;
+//extern t_pd *garray_arraytemplatecanvas;
+//extern t_pd *garray_floattemplatecanvas;
+extern void glob_closeall(void *dummy, t_floatarg fforce);
 
 void glob_quit(void *dummy)
 {
@@ -1323,6 +1324,7 @@ void glob_quit(void *dummy)
 	//let's try to cleanly remove invisible template canvases
 	//if (garray_arraytemplatecanvas) canvas_free( (t_canvas *)garray_arraytemplatecanvas);
 	//if (garray_floattemplatecanvas) canvas_free( (t_canvas *)garray_floattemplatecanvas);
+	glob_closeall(0, 1);
     sys_vgui("exit\n");
     if (!sys_nogui)
     {