diff --git a/extra/ui/ui.factor b/extra/ui/ui.factor
index febb56e10f..4daadd2765 100755
--- a/extra/ui/ui.factor
+++ b/extra/ui/ui.factor
@@ -120,12 +120,12 @@ SYMBOL: ui-hook
     [ dup update-hand draw-world ] each ;
 
 : notify ( gadget -- )
-    dup gadget-graft-state {
-        { { f t } [ dup activate-control dup graft* ] }
-        { { t f } [ dup activate-control dup ungraft* ] }
-    } case
-    dup gadget-graft-state first { f f } { t t } ?
-    swap set-gadget-graft-state ;
+    dup gadget-graft-state [ dup {
+        { { f t } [ over activate-control over graft* ] }
+        { { t f } [ over activate-control over ungraft* ] }
+    } case ]
+    [ first { f f } { t t } ?
+      swap set-gadget-graft-state ] [ ] cleanup ;
 
 : notify-queued ( -- )
     graft-queue [ notify ] dlist-slurp ;