diff --git a/go.mod b/go.mod
index 4ee2eac..6245a7c 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/charmbracelet/teaparty v0.0.0-20200504225426-da64445a0e0d
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/muesli/reflow v0.1.0
-	github.com/muesli/termenv v0.5.2
+	github.com/muesli/termenv v0.6.0
 	github.com/spf13/cobra v0.0.7
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
diff --git a/main.go b/main.go
index e9bd8af..c57bf9b 100644
--- a/main.go
+++ b/main.go
@@ -152,13 +152,20 @@ func execute(cmd *cobra.Command, args []string) error {
 
 	if len(args) == 0 {
 		//return executeArg(cmd, "", os.Stdout)
+
 		debug := os.Getenv("GLOW_DEBUG")
 		if debug != "" {
 			boba.UseSysLog("glow")
 		}
+
+		boba.AltScreen()
 		if err := ui.NewProgram().Start(); err != nil {
 			return err
 		}
+		boba.ExitAltScreen()
+
+		fmt.Println("\n  Thanks for using Glow!\n")
+		return nil
 	}
 
 	for _, arg := range args {
diff --git a/ui/ui.go b/ui/ui.go
index 771e6a4..a187c4b 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -32,7 +32,6 @@ const (
 	stateKeygenRunning
 	stateKeygenFinished
 	stateShowStash
-	stateQuitting
 )
 
 type model struct {
@@ -75,8 +74,11 @@ func update(msg boba.Msg, mdl boba.Model) (boba.Model, boba.Cmd) {
 
 	case boba.KeyMsg:
 		switch msg.String() {
+		case "q":
+			fallthrough
+		case "esc":
+			fallthrough
 		case "ctrl+c":
-			m.state = stateQuitting
 			return m, boba.Quit
 		}
 
@@ -164,8 +166,6 @@ func view(mdl boba.Model) string {
 		s += spinner.View(m.spinner) + " Re-initializing..."
 	case stateShowStash:
 		s += stashView(m.stash)
-	case stateQuitting:
-		s += "Thanks for using Glow!"
 	}
 	if m.state != stateShowStash {
 		s = "\n" + indent.String(s, 2)