diff --git a/extra/ui/tools/debugger/debugger.factor b/extra/ui/tools/debugger/debugger.factor
index 548b0a0b0e..6ed98f4964 100644
--- a/extra/ui/tools/debugger/debugger.factor
+++ b/extra/ui/tools/debugger/debugger.factor
@@ -1,12 +1,13 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays ui ui.commands ui.gestures ui.gadgets
-ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
-ui.gadgets.labels ui.gadgets.panes ui.gadgets.presentations
-ui.gadgets.viewports ui.gadgets.lists ui.gadgets.tracks
-ui.gadgets.scrollers ui.gadgets.panes hashtables io kernel math
-models namespaces sequences sequences words continuations
-debugger prettyprint ui.tools.traceback help editors ;
+       ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
+       ui.gadgets.labels ui.gadgets.panes ui.gadgets.presentations
+       ui.gadgets.viewports ui.gadgets.lists ui.gadgets.tracks
+       ui.gadgets.scrollers ui.gadgets.panes hashtables io kernel math
+       models namespaces sequences sequences words continuations
+       debugger prettyprint ui.tools.traceback help editors ;
+
 IN: ui.tools.debugger
 
 : <restart-list> ( restarts restart-hook -- gadget )
@@ -15,20 +16,18 @@ IN: ui.tools.debugger
 TUPLE: debugger < track restarts ;
 
 : <debugger-display> ( restart-list error -- gadget )
-  <filled-pile>
-    <pane>
-      swapd tuck [ print-error ] with-pane
-    add-gadget
+    <filled-pile>
+        <pane>
+            swapd tuck [ print-error ] with-pane
+        add-gadget
 
-    swap add-gadget ;
+        swap add-gadget ;
 
 : <debugger> ( error restarts restart-hook -- gadget )
     { 0 1 } debugger new-track
-    [
-        toolbar,
-        <restart-list> g-> set-debugger-restarts
-        swap <debugger-display> <scroller> 1 track,
-    ] make-gadget ;
+        dup <toolbar> f track-add*
+        -rot <restart-list> >>restarts
+        dup restarts>> rot <debugger-display> <scroller> 1 track-add* ;
 
 M: debugger focusable-child* debugger-restarts ;