diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32c34576..b2480082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ Release date: TBD
 - Reload only the selected tab and keep its URL on "Reload" and "Clear Cache and Reload".
 - Disabled `eval()` function for security improvements.
 - Invalidate cache before load, to make server upgrades easy
+- Ctrl/Command+F puts cursor in search box to search in current channel.
 
 #### Windows
 - Update Mattermost icon for desktop notifications in Windows 10.
diff --git a/docs/setup.md b/docs/setup.md
index 8bdb90f2..0ffeb318 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -149,6 +149,7 @@ Below lists menu options (shortcut keys are listed in brackets, `Ctrl` becomes `
   - **Copy** (Ctrl+C) - Copies selected text
   - **Paste** (Ctrl+V) - Pastes text from clipboard
   - **Select All** (Ctrl+A) - Select all text in input box
+  - **Search in Channel** (Ctrl+F) - Puts cursor in search box to search in current channel
 - **View**
   - **Reload** (Ctrl+R) - Reload page from the server
   - **Clear Cache and Reload** (Ctrl+Shift+R) - Clear cached content in application and reload page