diff --git a/README.md b/README.md
index d7ff1ea1b..b7d9bb8b7 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Jira? This is the app for you!
     [Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md)
   * [Cool Features](https://github.com/jesseduffield/lazygit#cool-features)
   * [Contributing](https://github.com/jesseduffield/lazygit#contributing)
-  * [Video Tutorial](https://www.youtube.com/watch?v=VDXvbHZYeKY)
+  * [Video Tutorial](https://youtu.be/VDXvbHZYeKY)
   * [Twitch Stream](https://www.twitch.tv/jesseduffield)
 
 ## Installation
@@ -94,7 +94,7 @@ Call `lazygit` in your terminal inside a git repository. If you want, you can
 also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or
 whichever rc file you're using).
 
-  * Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY).
+  * Basic video tutorial [here](https://youtu.be/VDXvbHZYeKY).
   * List of keybindings
 [here](/docs/Keybindings.md).
 
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 681601d00..9725426ba 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -180,6 +180,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			}
 			v.Title = gui.Tr.SLocalize("NotEnoughSpace")
 			v.Wrap = true
+			g.SetCurrentView(v.Name())
 		}
 		return nil
 	}
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
index 89b3e997e..aeae19c50 100644
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -58,7 +58,7 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
 			"Copyright (c) 2018 Jesse Duffield",
 			"Keybindings: https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md",
 			"Config Options: https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
-			"Tutorial: https://www.youtube.com/watch?v=VDXvbHZYeKY",
+			"Tutorial: https://youtu.be/VDXvbHZYeKY",
 			"Raise an Issue: https://github.com/jesseduffield/lazygit/issues",
 			"Buy Jesse a coffee: https://donorbox.org/lazygit",
 		}, "\n\n")