diff --git a/extra/ui/gadgets/gadgets.factor b/extra/ui/gadgets/gadgets.factor
index 6f49791164..f5e1f35081 100755
--- a/extra/ui/gadgets/gadgets.factor
+++ b/extra/ui/gadgets/gadgets.factor
@@ -74,13 +74,9 @@ M: gadget children-on nip children>> ;
     swapd [ rect-loc v- over v. 0 <=> ] binsearch nip ;
 
 : fast-children-on ( rect axis children -- from to )
-    3dup
-    >r >r dup rect-loc swap rect-dim v+
-    r> r> (fast-children-on) ?1+
-    >r
-    >r >r rect-loc
-    r> r> (fast-children-on) 0 or
-    r> ;
+  [ >r >r rect-loc r> r> (fast-children-on) 0 or ]
+  [ >r >r dup rect-loc swap rect-dim v+ r> r> (fast-children-on) ?1+ ]
+  3bi ;
 
 : inside? ( bounds gadget -- ? )
     dup visible?>> [ intersects? ] [ 2drop f ] if ;