diff --git a/pd/src/g_canvas.c b/pd/src/g_canvas.c
index 7eb344224cbcd7ca45572e6191208357a221d8ea..ebeb733f42be21ea922a48b436fa4a088d607fc6 100644
--- a/pd/src/g_canvas.c
+++ b/pd/src/g_canvas.c
@@ -690,7 +690,7 @@ void canvas_dirty(t_canvas *x, t_floatarg n)
     if ((unsigned)n != x2->gl_dirty)
     {
         x2->gl_dirty = n;
-        if (glist_isvisible(x2))
+        if (x2->gl_havewindow) // was glist_isvisible(x2)
             canvas_reflecttitle(x2);
     }
 }
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 83b57af554238bd84941ae4efee23e50f9ddccd4..d2c3217dc5452f92b551e045f13f1188216e4213 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -2182,19 +2182,22 @@ static char *cursorlist[] = {
 
 void canvas_setcursor(t_canvas *x, unsigned int cursornum)
 {
-    //fprintf(stderr,"canvas_setcursor %d\n", cursornum);
-    static t_canvas *xwas;
-    static unsigned int cursorwas;
-    if (cursornum >= sizeof(cursorlist)/sizeof *cursorlist)
-    {
-    bug("canvas_setcursor");
-        return;
-    }
-    if (xwas != x || cursorwas != cursornum)
+    if (x->gl_havewindow)
     {
-        sys_vgui(".x%lx configure -cursor %s\n", x, cursorlist[cursornum]);
-        xwas = x;
-        cursorwas = cursornum;
+        //fprintf(stderr,"canvas_setcursor %d\n", cursornum);
+        static t_canvas *xwas;
+        static unsigned int cursorwas;
+        if (cursornum >= sizeof(cursorlist)/sizeof *cursorlist)
+        {
+        bug("canvas_setcursor");
+            return;
+        }
+        if (xwas != x || cursorwas != cursornum)
+        {
+            sys_vgui(".x%lx configure -cursor %s\n", x, cursorlist[cursornum]);
+            xwas = x;
+            cursorwas = cursornum;
+        }
     }
 }