diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 0631fc2f5b..ad0be948c6 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -285,9 +285,10 @@ M: string listener-input
     [ set-editor-string ] [ request-focus ] bi ;
 
 : call-listener ( quot command -- )
-    get-ready-listener
-    '[ _ _ _ dup wait-for-listener (call-listener) ]
-    "Listener call" spawn drop ;
+    get-ready-listener '[
+        _ _ _ dup wait-for-listener
+        [ (call-listener) ] with-ctrl-break
+    ] "Listener call" spawn drop ;
 
 M: listener-command invoke-command ( target command -- )
     [ command-quot ] [ nip ] 2bi call-listener ;
diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index 480eec1af6..3bf6fd0ce5 100644
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -1,16 +1,13 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel listener memory system ui ui.commands ui.gestures
-ui.private ui.tools.browser ui.tools.common ui.tools.error-list
-ui.tools.listener ui.tools.operations ui.tools.walker
+USING: memory system ui ui.commands ui.gestures ui.tools.browser
+ui.tools.common ui.tools.error-list ui.tools.listener
 vocabs.refresh ;
 IN: ui.tools
 
 MAIN: listener-window
 
-: refresh-all-cmd ( -- ) [ refresh-all ] with-ctrl-break ;
-
-\ refresh-all-cmd H{ { +nullary+ t } { +listener+ t } } define-command
+\ refresh-all H{ { +nullary+ t } { +listener+ t } } define-command
 
 \ save H{ { +nullary+ t } } define-command
 
@@ -29,6 +26,6 @@ tool "common" f {
     { T{ key-down f { A+ } "w" } close-window }
     { T{ key-down f { A+ } "F" } toggle-fullscreen }
     { T{ key-down f { A+ } "q" } com-exit }
-    { T{ key-down f f "F2" } refresh-all-cmd }
+    { T{ key-down f f "F2" } refresh-all }
     { T{ key-down f f "F3" } show-error-list }
 } define-command-map