diff --git a/website/_includes/multi-line.md b/website/_includes/multi-line.md
new file mode 100644
index 000000000..910d50407
--- /dev/null
+++ b/website/_includes/multi-line.md
@@ -0,0 +1,4 @@
+You can send long, multi-line messages in the chat in a few ways:
+  - Paste a multi-line message directly into the chat.
+  - Enter `{` alone on the first line to start a multiline message and `}` alone on the last line to end it.
+  - Use Meta-ENTER to start a new line without sending the message (Esc+ENTER in some environments).
diff --git a/website/docs/commands.md b/website/docs/commands.md
index 8938438d1..9088b7916 100644
--- a/website/docs/commands.md
+++ b/website/docs/commands.md
@@ -32,6 +32,10 @@ cog.out(get_help_md())
 - **/web** Use headless selenium to scrape a webpage and add the content to the chat
 <!--[[[end]]]-->
 
+# Entering multi-line chat messages
+
+{% include multi-line.md %}
+
 # Keybindings
 
 The interactive prompt is built with [prompt-toolkit](https://github.com/prompt-toolkit/python-prompt-toolkit) which provides a lot of Emacs and Vi-style keyboard. Some emacs bindings you may find useful are
@@ -47,5 +51,3 @@ The interactive prompt is built with [prompt-toolkit](https://github.com/prompt-
 - `Ctrl-P` : Move up to the previous history entry.
 - `Ctrl-R` : Reverse search in command history.
 
-Note: aider currently exits vi normal mode after a single command, (maybe something to do with the esc keybinding?).
-Feel free to investigate and make a PR if you would like to see it fully supported.
diff --git a/website/docs/tips.md b/website/docs/tips.md
index 85e353d91..83a85fdda 100644
--- a/website/docs/tips.md
+++ b/website/docs/tips.md
@@ -20,10 +20,7 @@ Or just paste the errors into the chat. Let the aider figure out and fix the bug
 - If test are failing, use the `/test` [in-chat command](/docs/commands.html)
 to run tests and
 share the error output with the aider.
-- You can send long, multi-line messages in the chat:
-  - In most environments, you can paste multi-line messages directly into the chat.
-  - Enter `{` alone on the first line to start a multiline message and `}` alone on the last line to end and send it.
-  - You can use Meta-ENTER (Esc+ENTER in some environments) to start a new line without sending the message.
+- {% include multi-line.md %}
 - LLMs know about a lot of standard tools and libraries, but may get some of the fine details wrong about API versions and function arguments.
 You can paste doc snippets into the chat to resolve these issues.