diff --git a/src/terminal/drawing/draw.c b/src/terminal/drawing/draw.c
index 35236ee..3f61962 100644
--- a/src/terminal/drawing/draw.c
+++ b/src/terminal/drawing/draw.c
@@ -428,27 +428,6 @@ LIB3270_EXPORT void v3270_reload(GtkWidget *widget)
 
     cairo_destroy(cr);
 
-	/*
-	v3270 * terminal = GTK_V3270(widget);
-	cairo_t * cr;
-
-
-
-	// Create new terminal image
-	if(terminal->surface)
-		cairo_surface_destroy(terminal->surface);
-
-	terminal->surface = (cairo_surface_t *) gdk_window_create_similar_surface(gtk_widget_get_window(widget),CAIRO_CONTENT_COLOR,width,height);
-
-	// Update the created image
-	cr = cairo_create(terminal->surface);
-	v3270_compute_font_size(terminal, cr, width, height);
-	v3270_update_font_metrics(terminal, width, height);
-
-	v3270_redraw(terminal, cr, width, height);
-
-    cairo_destroy(cr);
-    */
 }
 
 void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor)
diff --git a/src/terminal/font/properties.c b/src/terminal/font/properties.c
index 2b733c7..590f593 100644
--- a/src/terminal/font/properties.c
+++ b/src/terminal/font/properties.c
@@ -66,12 +66,14 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name)
 		g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG], 0, "font-family", name);
 		g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.font_family);
 
-		v3270_reconfigure(terminal);
-		gtk_widget_queue_draw(widget);
+		if(gtk_widget_get_realized(widget) && gtk_widget_get_has_window(widget))
+		{
+			v3270_reconfigure(terminal);
+			gtk_widget_queue_draw(widget);
+		}
 
 	}
 
-
 }
 
 LIB3270_EXPORT const gchar * v3270_get_font_family(GtkWidget *widget)
--
libgit2 0.21.2