diff --git a/katzen.go b/katzen.go
index 031eb8a..93f4239 100644
--- a/katzen.go
+++ b/katzen.go
@@ -78,6 +78,11 @@ func (a *App) Layout(gtx layout.Context) {
 }
 
 func (a *App) update(gtx layout.Context) {
+	if a.stack.Len() == 0 {
+		a.stack.Push(newSignInPage(a))
+		return
+	}
+
 	page := a.stack.Current()
 	if e := page.Event(gtx); e != nil {
 		switch e := e.(type) {
diff --git a/stack.go b/stack.go
index fcfd9e3..7794cb5 100644
--- a/stack.go
+++ b/stack.go
@@ -126,6 +126,9 @@ func (s *pageStack) Pop() {
 		s.pages[i] = nil
 		s.pages = s.pages[:i]
 	}
+	if len(s.pages) > 0 {
+		s.start() // start new top of stack
+	}
 }
 
 func (s *pageStack) start() {