diff --git a/library/ui/gadgets/panes.factor b/library/ui/gadgets/panes.factor
index 41fb59c652..ce7778c5bb 100644
--- a/library/ui/gadgets/panes.factor
+++ b/library/ui/gadgets/panes.factor
@@ -69,7 +69,7 @@ M: pane-stream stream-format
 
 M: pane-stream stream-close drop ;
 
-M: pane stream-flush drop ;
+M: pane-stream stream-flush drop ;
 
 M: pane-stream with-stream-style (with-stream-style) ;
 
@@ -77,7 +77,7 @@ GENERIC: write-gadget ( gadget stream -- )
 
 M: pane-stream write-gadget
     #! Print a gadget to the given pane.
-    pane-current add-gadget ;
+    pane-stream-pane pane-current add-gadget ;
 
 M: duplex-stream write-gadget
     duplex-stream-out write-gadget ;
diff --git a/library/ui/gadgets/presentations.factor b/library/ui/gadgets/presentations.factor
index 48c97e4bcf..617ee10d79 100644
--- a/library/ui/gadgets/presentations.factor
+++ b/library/ui/gadgets/presentations.factor
@@ -191,10 +191,10 @@ presentation H{
         [ pick pick >r >r -rot styled-pane r> r> rot ] map
     ] map styled-grid nip ;
 
-M: pane with-stream-table
+M: pane-stream with-stream-table
     >r rot <pane-grid> r> print-gadget ;
 
-M: pane with-nested-stream
+M: pane-stream with-nested-stream
     >r styled-pane r> write-gadget ;
 
 ! Stream utilities
diff --git a/library/ui/tools/listener.factor b/library/ui/tools/listener.factor
index 7121a1a674..083d71e43a 100644
--- a/library/ui/tools/listener.factor
+++ b/library/ui/tools/listener.factor
@@ -43,9 +43,19 @@ TUPLE: listener-gadget input output stack minibuffer use ;
 
 C: listener-gadget ( -- gadget )
     dup init-listener {
-        { [ <scrolling-pane> ] set-listener-gadget-output [ <scroller> ] 4/6 }
+        {
+            [ <scrolling-pane> ]
+            set-listener-gadget-output
+            [ <scroller> ]
+            4/6
+        }
         { [ <stack-display> ] f f 1/6 }
-        { [ <listener-input> ] set-listener-gadget-input [ <scroller> "Input" <labelled-gadget> ] 1/6 }
+        {
+            [ <listener-input> ]
+            set-listener-gadget-input
+            [ <scroller> "Input" <labelled-gadget> ]
+            1/6
+        }
     } { 0 1 } make-track* ;
 
 M: listener-gadget focusable-child*
@@ -130,7 +140,7 @@ listener-gadget "Listener commands" {
     { "Send EOF" T{ key-down f { C+ } "d" } [ listener-eof ] }
     {
         "History"
-        T{ key-down f "UP" }
+        T{ key-down f { C+ } "h" }
         [ show-history ]
     }
     {