diff --git a/src/pw3270/v3270/draw.c b/src/pw3270/v3270/draw.c
index 689358f..20e9adf 100644
--- a/src/pw3270/v3270/draw.c
+++ b/src/pw3270/v3270/draw.c
@@ -438,7 +438,7 @@ void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned sho
 
 void v3270_update_cursor_surface(v3270 *widget,unsigned char chr,unsigned short attr)
 {
-	if(widget->cursor.surface)
+	if(widget->cursor.surface && widget->drawing)
 	{
 		GdkRectangle	  rect	= widget->cursor.rect;
 		cairo_t			* cr 	= cairo_create(widget->cursor.surface);
diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c
index 5c672a3..584c2a7 100644
--- a/src/pw3270/v3270/widget.c
+++ b/src/pw3270/v3270/widget.c
@@ -1489,9 +1489,13 @@ void v3270_disconnect(GtkWidget *widget)
 {
 	g_return_if_fail(GTK_IS_V3270(widget));
 	v3270_disable_updates(widget);
+	debug("%s",__FUNCTION__);
 	lib3270_unselect(GTK_V3270(widget)->host);
+	debug("%s",__FUNCTION__);
 	lib3270_disconnect(GTK_V3270(widget)->host);
+	debug("%s",__FUNCTION__);
 	v3270_enable_updates(widget);
+	debug("%s",__FUNCTION__);
 }
 
 H3270 * v3270_get_session(GtkWidget *widget)
--
libgit2 0.21.2