diff --git a/pom.xml b/pom.xml
index fb0fa20d..e885c484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
+            <version>1236.vb_763772ecd87</version> <!-- TODO: https://github.com/jenkinsci/workflow-api-plugin/pull/296 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
index 56cea822..ee135f7b 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -86,6 +86,8 @@
 import java.util.logging.Logger;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.io.Closeable;
+import java.io.InterruptedIOException;
 import jenkins.model.CauseOfInterruption;
 import jenkins.model.Jenkins;
 import jenkins.model.lazy.BuildReference;
@@ -1080,7 +1082,23 @@ private final class GraphL implements GraphListener {
      */
     private final class NodePrintListener implements GraphListener.Synchronous {
         @Override public void onNewHead(FlowNode node) {
-            NewNodeConsoleNote.print(node, getListener());
+            // TODO: Breaks show/hide links in the console because the line with the show/hide link gets hidden.
+            LogStorage storage = LogStorage.of(asFlowExecutionOwner());
+            try {
+                TaskListener listener = TaskListenerDecorator.apply(storage.nodeListener(node), asFlowExecutionOwner(), null);
+                try {
+                    NewNodeConsoleNote.print(node, listener);
+                } finally {
+                    if (listener instanceof Closeable) {
+                        ((Closeable) listener).close();
+                    }
+                }
+            } catch (InterruptedIOException | InterruptedException e) {
+                Thread.currentThread().interrupt();
+                LOGGER.log(Level.FINE, e, () -> "Unable to write NewNodeConsoleNote for node " + node.getId());
+            } catch (IOException e) {
+                LOGGER.log(Level.FINE, e, () -> "Unable to write NewNodeConsoleNote for node " + node.getId());
+            }
         }
     }
 
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote.java b/src/main/java/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote.java
index 5cc0ca0a..0d4d5b1b 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote.java
@@ -60,7 +60,7 @@
  * @see LogStorage#startStep
  */
 @Restricted(NoExternalUse.class)
-public class NewNodeConsoleNote extends ConsoleNote<WorkflowRun> {
+public class NewNodeConsoleNote extends ConsoleNote {
 
     private static final Logger LOGGER = Logger.getLogger(NewNodeConsoleNote.class.getName());
 
@@ -98,7 +98,7 @@ private NewNodeConsoleNote(FlowNode node) {
     }
 
     @Override
-    public ConsoleAnnotator<?> annotate(WorkflowRun context, MarkupText text, int charPos) {
+    public ConsoleAnnotator<?> annotate(Object context, MarkupText text, int charPos) {
         try {
             StringBuilder startTag = startTagFor(context, id, start, enclosing);
             text.addMarkup(0, text.length(), startTag.toString(), "</span>");
@@ -109,7 +109,7 @@ public ConsoleAnnotator<?> annotate(WorkflowRun context, MarkupText text, int ch
     }
 
     @Restricted(NoExternalUse.class)
-    public static StringBuilder startTagFor(@NonNull WorkflowRun context, @NonNull String id, @CheckForNull String start, @CheckForNull String enclosing) {
+    public static StringBuilder startTagFor(@NonNull Object context, @NonNull String id, @CheckForNull String start, @CheckForNull String enclosing) {
         StringBuilder startTag = new StringBuilder("<span class=\"pipeline-new-node\" nodeId=\"").append(id);
         if (start != null) {
             startTag.append("\" startId=\"").append(start);
@@ -117,7 +117,12 @@ public static StringBuilder startTagFor(@NonNull WorkflowRun context, @NonNull S
         if (enclosing != null) {
             startTag.append("\" enclosingId=\"").append(enclosing);
         }
-        FlowExecution execution = context.getExecution();
+        FlowExecution execution = null;
+        if (context instanceof WorkflowRun) {
+            execution = ((WorkflowRun) context).getExecution();
+        } else if (context instanceof FlowNode) {
+            execution = ((FlowNode) context).getExecution();
+        }
         if (execution != null) {
             try {
                 FlowNode node = execution.getNode(id);
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote/script.js b/src/main/resources/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote/script.js
index e408983f..8adb1886 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote/script.js
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/job/console/NewNodeConsoleNote/script.js
@@ -66,18 +66,35 @@ function showHidePipelineSection(link) {
         link.textContent = 'hide'
         link.parentNode.className = 'pipeline-show-hide'
     }
-    var showHide = function(id, display) {
+    var showHide = function(id, display, isClickedElement) {
         var sect = '.pipeline-node-' + id
         var ss = document.styleSheets[0]
+        var foundCssRule = false;
         for (var i = 0; i < ss.cssRules.length; i++) {
             if (ss.cssRules[i].selectorText === sect) {
                 ss.cssRules[i].style.display = display
-                return
+                foundCssRule = true;
+                break;
+            }
+        }
+        if (!foundCssRule) {
+            ss.insertRule(sect + ' {display: ' + display + '}', ss.cssRules.length);
+        }
+        if (isClickedElement) {
+            // We have to move the console note with the show/hide link that got clicked outside of the section for the
+            // node before we hide it, otherwise the show link will be hidden.
+            var sectNode = document.querySelector(sect);
+            if (sectNode) {
+                var spanNode = document.querySelector('.pipeline-new-node[nodeId=\'' + id + '\']');
+                if (display === 'none') {
+                    sectNode.insertAdjacentElement('beforebegin', spanNode);
+                } else {
+                    sectNode.insertAdjacentElement('afterbegin', spanNode);
+                }
             }
         }
-        ss.insertRule(sect + ' {display: ' + display + '}', ss.cssRules.length)
     }
-    showHide(id, display)
+    showHide(id, display, true);
     if (span.getAttribute('startId') != null) {
         // For a block node, look up other pipeline-new-node elements parented to this (transitively) and mask them and their text too.
         var nodes = document.querySelectorAll('.pipeline-new-node')
@@ -110,14 +127,14 @@ function showHidePipelineSection(link) {
         for (var i = 0; i < ids.length; i++) {
             var oid = ids[i]
             if (oid != id && encloses(id, oid, starts, enclosings)) {
-                showHide(oid, display)
-                var headers = document.querySelectorAll('.pipeline-new-node[nodeId=' + oid + ']');
+                showHide(oid, display, false);
+                var headers = document.querySelectorAll('.pipeline-new-node[nodeId=\'' + oid + '\']');
                 for (var j = 0; j < headers.length; j++) {
                     headers[j].style.display = display;
                 }
                 if (display === 'inline') {
                     // Mark all children as shown. TODO would be nicer to leave them collapsed if they were before, but this gets complicated.
-                    var links = document.querySelectorAll('.pipeline-new-node[nodeId=' + oid + '] span a');
+                    var links = document.querySelectorAll('.pipeline-new-node[nodeId=\'' + oid + '\'] span a');
                     for (var j = 0; j < links.length; j++) {
                         links[j].textContent = 'hide';
                         links[j].parentNode.className = 'pipeline-show-hide';
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/job/console/DefaultLogStorageTest.java b/src/test/java/org/jenkinsci/plugins/workflow/job/console/DefaultLogStorageTest.java
index 638d2364..872454f4 100644
--- a/src/test/java/org/jenkinsci/plugins/workflow/job/console/DefaultLogStorageTest.java
+++ b/src/test/java/org/jenkinsci/plugins/workflow/job/console/DefaultLogStorageTest.java
@@ -99,7 +99,7 @@ public class DefaultLogStorageTest {
         assertLogContains(page, hudson.model.Messages.Cause_UserIdCause_ShortDescription(alice.getDisplayName()), alice.getUrl());
         assertLogContains(page, "Running inside " + b.getDisplayName(), b.getUrl());
         assertThat(page.getWebResponse().getContentAsString().replace("\r\n", "\n"),
-            containsString("<span class=\"pipeline-new-node\" nodeId=\"3\" enclosingId=\"2\">[Pipeline] hyperlink\n</span><span class=\"pipeline-node-3\">Running inside <a href="));
+            containsString("<span class=\"pipeline-node-3\"><span class=\"pipeline-new-node\" nodeId=\"3\" enclosingId=\"2\">[Pipeline] hyperlink\n</span>Running inside <a href="));
         DepthFirstScanner scanner = new DepthFirstScanner();
         scanner.setup(b.getExecution().getCurrentHeads());
         List<FlowNode> nodes = Lists.newArrayList(scanner.filter(FlowScanningUtils.hasActionPredicate(LogAction.class)));
@@ -187,7 +187,8 @@ static class Execution extends SynchronousStepExecution<Void> {
         assertNotNull(la);
         baos = new ByteArrayOutputStream();
         la.getLogText().writeRawLogTo(0, baos);
-        assertThat(baos.toString(), not(containsString("Pipeline")));
+        assertThat(baos.toString(), not(containsString("[Pipeline] Start of Pipeline")));
+        assertThat(baos.toString(), containsString("[Pipeline] echo"));
         // Whole-build:
         sw = new StringWriter();
         start = System.nanoTime();
@@ -226,7 +227,7 @@ static class Execution extends SynchronousStepExecution<Void> {
         start = System.nanoTime();
         length = la.getLogText().length();
         System.out.printf("Took %dms to compute length of one short node%n", (System.nanoTime() - start) / 1000 / 1000);
-        assertThat(length, lessThan(50L));
+        assertThat(length, lessThan(350L));
     }
 
     @Ignore("Currently not asserting anything, just here for interactive evaluation.")