diff --git a/src/g_editor.c b/src/g_editor.c
index b548255c04043689c5642fc9f750d69f0e54452f..d0859f6a8ce77212b03d0aad513a9cbc3171ca95 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -885,7 +885,9 @@ static void *canvas_undo_set_apply(t_canvas *x, t_gobj *obj)
     t_gobj *y;
     t_linetraverser t;
     t_outconnect *oc;
-	/* select the object we are working on */
+	/* enable editor (in case it is disabled) and select the object we are working on */
+	if (!x->gl_edit)
+		canvas_editmode(x, 1);
 	if (!glist_isselected(x, obj))
 		glist_select(x, obj);
     int nnotsel= glist_selectionindex(x, 0, 0); /* get number of all items for the offset below */
@@ -1393,7 +1395,8 @@ static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos, t_float
 				else {
 					if (!x->gl_edit)
 						canvas_editmode(x, 1);
-					glist_select(x, y);
+					if (!glist_isselected(x, y))
+						glist_select(x, y);
                 	(*class_getpropertiesfn(pd_class(&y->g_pd)))(y, x);
 				}
                 return;
diff --git a/src/m_pd.h b/src/m_pd.h
index 04f15bcf2aa71e8952d3737361c5e48bf8befbda..5b1848e6ab6ff37afbe9a3676c8116707a3d218d 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-20101215"
+#define PD_TEST_VERSION "extended-l2ork-20101216"
 
 /* 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 */