diff --git a/share/functions/__fish_cancel_commandline.fish b/share/functions/__fish_cancel_commandline.fish
index f3bd68513..23c76aa78 100644
--- a/share/functions/__fish_cancel_commandline.fish
+++ b/share/functions/__fish_cancel_commandline.fish
@@ -19,7 +19,9 @@ function __fish_cancel_commandline
             echo ""
         end
         commandline ""
-        commandline -f repaint
         emit fish_cancel
     end
+    # Repaint even if we haven't cancelled anything,
+    # so the prompt refreshes and the terminal scrolls to it.
+    commandline -f repaint
 end