diff --git a/core/comp_ui.py b/core/comp_ui.py
index 187e3ed827..adbdd1ab33 100644
--- a/core/comp_ui.py
+++ b/core/comp_ui.py
@@ -553,7 +553,9 @@ def _MaybeWriteHistoryFile(history_filename):
 
   # The 'atexit' module is a small wrapper around sys.exitfunc.
   atexit.register(_MaybeWriteHistoryFile, history_filename)
-  readline_mod.parse_and_bind("tab: complete")
+  readline_mod.parse_and_bind('tab: complete')
+
+  readline_mod.parse_and_bind('set horizontal-scroll-mode on')
 
   # How does this map to C?
   # https://cnswww.cns.cwru.edu/php/chet/readline/readline.html#SEC45
diff --git a/devtools/release-note.sh b/devtools/release-note.sh
index 085b4e04ec..d729daade1 100755
--- a/devtools/release-note.sh
+++ b/devtools/release-note.sh
@@ -14,7 +14,7 @@ set -o errexit
 source devtools/release-version.sh  # for escape-segements
 
 readonly OIL_VERSION=$(head -n 1 oil-version.txt)
-readonly PREV_VERSION='0.9.4'
+readonly PREV_VERSION='0.9.6'
 
 # adapted from release-version.sh
 _git-changelog-body() {