diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82d19e2..5e6270e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
 ## [Unreleased]
 ### Added
 - **Themeing** - check out [default-config.toml](./default-config.toml) for details (#46)
@@ -24,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Using the `..` command doesn't keep the query string (#49)
 - Any error that occurs when downloading a file will be displayed, and the partially downloaded file will be deleted
 - Allow for opening a new tab while the current one is loading
+- Pressing Escape after typing in the bottom bar no longer jumps you back to the top of the page
 
 
 ## [1.3.0] - 2020-07-10
@@ -47,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Plain text documents are displayed faithfully (there were some edge conditions)
 - Opening files in portal.mozz.us uses the `http` setting in the config (#42)
 
+
 ## [1.2.0] - 2020-07-02
 ### Added
 - Alt-Left and Alt-Right for history navigation (#23)
@@ -76,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - New tab text is wrapped to terminal width like other pages (#31)
 - TOFU "continue anyway" popup has a question mark at the end
 
+
 ## [1.1.0] - 2020-06-24
 ### Added
 - **Bookmarks** (#10)
diff --git a/NOTES.md b/NOTES.md
index 3011b2d..1dab6ea 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -3,7 +3,6 @@
 ## Issues
 - URL for each tab should not be stored as a string - in the current code there's lots of reparsing the URL
 - Can't go back or do other things while page is loading - need a way to stop `handleURL`
-- Pressing Escape in the bottom bar jumps back to the top of the page
 
 ## Regressions
 
diff --git a/display/display.go b/display/display.go
index 94dc733..b6a7832 100644
--- a/display/display.go
+++ b/display/display.go
@@ -105,6 +105,8 @@ func Init() {
 	bottomBar.SetDoneFunc(func(key tcell.Key) {
 		tab := curTab
 
+		tabs[tab].saveScroll()
+
 		// Reset func to set the bottomBar back to what it was before
 		// Use for errors.
 		reset := func() {
@@ -197,7 +199,7 @@ func Init() {
 			reset()
 			return
 
-		case tcell.KeyEscape:
+		case tcell.KeyEsc:
 			// Set back to what it was
 			reset()
 			return