diff --git a/README.md b/README.md
index 1bffaee5..44ef0f22 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Micro is devel-only for now because there is no released version.
 
 ### Prebuilt binaries
 
-| Download |
+| Nightly Binaries |
 | --- |
 | [Mac OS X](http://zbyedidia.webfactional.com/micro/binaries/micro-osx.tar.gz) |
 | [64 bit Linux](http://zbyedidia.webfactional.com/micro/binaries/micro-linux64.tar.gz) |
diff --git a/cmd/micro/view.go b/cmd/micro/view.go
index 7db9f84f..1a276798 100644
--- a/cmd/micro/view.go
+++ b/cmd/micro/view.go
@@ -489,7 +489,11 @@ func (v *View) HandleEvent(event tcell.Event) {
 			v.topline = 0
 			relocate = false
 		case tcell.KeyEnd:
-			v.topline = len(v.buf.lines) - 1 - v.height
+			if v.height > len(v.buf.lines) {
+				v.topline = 0
+			} else {
+				v.topline = len(v.buf.lines) - v.height
+			}
 			relocate = false
 		case tcell.KeyPgUp:
 			v.PageUp()