diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f43231f50d..c471c6b830 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5580,8 +5580,8 @@ gtk_tree_view_draw (GtkWidget *widget,
view_rect.x = 0;
view_rect.y = gtk_tree_view_get_effective_header_height (tree_view);
- view_rect.width = gdk_window_get_width (tree_view->priv->bin_window);
- view_rect.height = gdk_window_get_height (tree_view->priv->bin_window);
+ view_rect.width = gtk_widget_get_allocated_width (widget);
+ view_rect.height = gtk_widget_get_allocated_width (widget) - view_rect.y;
gdk_window_get_position (tree_view->priv->bin_window, &canvas_rect.x, &canvas_rect.y);
canvas_rect.y = -gtk_adjustment_get_value (tree_view->priv->vadjustment);
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 10aced432d..607a4f139c 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -420,6 +420,8 @@ testdata = \
textview-margins.ui \
toplevel-vs-popup.ref.ui \
toplevel-vs-popup.ui \
+ treeview-crash-too-wide.ref.ui \
+ treeview-crash-too-wide.ui \
treeview-fixed-height.css \
treeview-fixed-height.ref.ui \
treeview-fixed-height.ui \
diff --git a/testsuite/reftests/treeview-crash-too-wide.ref.ui b/testsuite/reftests/treeview-crash-too-wide.ref.ui
new file mode 100644
index 0000000000..a588e83fbc
--- /dev/null
+++ b/testsuite/reftests/treeview-crash-too-wide.ref.ui
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
diff --git a/testsuite/reftests/treeview-crash-too-wide.ui b/testsuite/reftests/treeview-crash-too-wide.ui
new file mode 100644
index 0000000000..a588e83fbc
--- /dev/null
+++ b/testsuite/reftests/treeview-crash-too-wide.ui
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+