diff --git a/library/ui/scrolling.factor b/library/ui/scrolling.factor
index e53919c56e..9ddbcfc58c 100644
--- a/library/ui/scrolling.factor
+++ b/library/ui/scrolling.factor
@@ -36,7 +36,9 @@ C: scroller ( gadget -- scroller )
         { [ <viewport> ] set-scroller-viewport @center }
         { [ <x-slider> ] set-scroller-x @bottom }
         { [ <y-slider> ] set-scroller-y @right }
-    } make-frame* dup scroller-actions ;
+    } make-frame*
+    dup scroller-actions
+    t over set-gadget-root? ;
 
 : set-slider ( value page max slider -- )
     #! page/max/value are 3-vectors.
diff --git a/library/ui/viewports.factor b/library/ui/viewports.factor
index 07d4269b3d..f526da5075 100644
--- a/library/ui/viewports.factor
+++ b/library/ui/viewports.factor
@@ -12,9 +12,7 @@ TUPLE: viewport ;
 : viewport-dim gadget-child pref-dim ;
 
 C: viewport ( content -- viewport )
-    dup delegate>gadget
-    t over set-gadget-root?
-    [ add-gadget ] keep ;
+    dup delegate>gadget [ add-gadget ] keep ;
 
 M: viewport pref-dim* gadget-child pref-dim ;