diff --git a/gui_canvas.c b/gui_canvas.c
index fb5c2a2..b529f5c 100644
--- a/gui_canvas.c
+++ b/gui_canvas.c
@@ -522,6 +522,8 @@ GtkWidget *make_canvas(void)
 	    GDK_SCROLL |
 	    GDK_POINTER_MOTION_MASK);
 
+	gtk_widget_set_double_buffered(canvas, FALSE);
+
 	draw_ctx.widget = canvas;
 
 	return canvas;
diff --git a/gui_tool.c b/gui_tool.c
index 3655b15..d42781b 100644
--- a/gui_tool.c
+++ b/gui_tool.c
@@ -848,14 +848,6 @@ const char *tool_tip(struct coord pos)
 	if (!inst)
 		return NULL;
 
-	/*
-	 * Tooltips don't work properly yet, so we return NULL here. The
-	 * tooltips themselves are fine, but the expose event generated when
-	 * removing the tooltip window upsets the overlay logic for some yet
-	 * unknown reason.
-	 */
-	return NULL;
-
 	/*
 	 * The logic below follows exactly what happens in get_hover_inst.
 	 */