diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 71a68c2..42dd42c 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -40,6 +40,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "a11y/gtkscrolledwindowaccessible.h"
+#include "gtkdebug.h"
 
 #include <math.h>
 
@@ -3219,10 +3220,14 @@ gtk_scrolled_window_get_preferred_size (GtkWidget      *widget,
                                           &min_child_size,
                                           &nat_child_size);
 
+          GTK_NOTE (SIZE_REQUEST,
+                    g_print ("scrolledwindow child width min %d nat %d\n",
+                             min_child_size, nat_child_size));
+
 	  if (priv->hscrollbar_policy == GTK_POLICY_NEVER)
 	    {
 	      minimum_req.width += min_child_size;
-	      natural_req.width += nat_child_size;
+              natural_req.width += nat_child_size;
 	    }
 	  else
 	    {
@@ -3234,11 +3239,8 @@ gtk_scrolled_window_get_preferred_size (GtkWidget      *widget,
 		  natural_req.width = MAX (natural_req.width, min_content_width);
 		  extra_width = -1;
 		}
-	      else
-		{
-		  minimum_req.width += vscrollbar_requisition.width;
-		  natural_req.width += vscrollbar_requisition.width;
-		}
+              else
+                natural_req.width += nat_child_size;
 	    }
 	}
       else /* GTK_ORIENTATION_VERTICAL */
@@ -3247,6 +3249,10 @@ gtk_scrolled_window_get_preferred_size (GtkWidget      *widget,
                                            &min_child_size,
                                            &nat_child_size);
 
+          GTK_NOTE (SIZE_REQUEST,
+                    g_print ("scrolledwindow child height min %d nat %d\n",
+                             min_child_size, nat_child_size));
+
 	  if (priv->vscrollbar_policy == GTK_POLICY_NEVER)
 	    {
 	      minimum_req.height += min_child_size;
@@ -3262,11 +3268,8 @@ gtk_scrolled_window_get_preferred_size (GtkWidget      *widget,
 		  natural_req.height = MAX (natural_req.height, min_content_height);
 		  extra_height = -1;
 		}
-	      else
-		{
-		  minimum_req.height += vscrollbar_requisition.height;
-		  natural_req.height += vscrollbar_requisition.height;
-		}
+              else
+                natural_req.height += nat_child_size;
 	    }
 	}
     }
