diff --git a/src/g_editor.c b/src/g_editor.c
index c3f48c596cb531dabf4e113d6d12ee9a9da44b55..94c4c2ffb50ad0fc27ad904b339ea578767a6ce7 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -2058,8 +2058,11 @@ static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos, t_float
 
 		canvas_doarrange(x, which, oldy, oldy_prev, oldy_next);
 	}
-    if (which == 0)
+    if (which == 0) {
+		if (!x->gl_edit)
+			canvas_editmode(x, 1);
         canvas_properties(x);
+	}
     else if (which == 2)
         open_via_helppath("intro.pd", canvas_getdir((t_canvas *)x)->s_name);
 }
diff --git a/src/m_pd.h b/src/m_pd.h
index 9a7fcd8433f03b81be387151628f16fedcef5296..13a928b7e5c52dd48290ee61c1568f65f5b8dc1d 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
 #define PD_MAJOR_VERSION 0
 #define PD_MINOR_VERSION 42
 #define PD_BUGFIX_VERSION 5
-#define PD_TEST_VERSION "extended-l2ork-20111122"
+#define PD_TEST_VERSION "extended-l2ork-20111130"
 
 /* old name for "MSW" flag -- we have to take it for the sake of many old
 "nmakefiles" for externs, which will define NT and not MSW */