diff --git a/pkg/cmd/repo/garden/garden.go b/pkg/cmd/repo/garden/garden.go
index 46761b253..e5129e4ad 100644
--- a/pkg/cmd/repo/garden/garden.go
+++ b/pkg/cmd/repo/garden/garden.go
@@ -189,6 +189,14 @@ func gardenRun(opts *GardenOptions) error {
 	player := &Player{0, 0, utils.Bold("@"), geo, 0}
 
 	garden := plantGarden(commits, geo)
+	if len(garden) < geo.Height {
+		geo.Height = len(garden)
+	}
+	if geo.Height > 0 && len(garden[0]) < geo.Width {
+		geo.Width = len(garden[0])
+	} else if len(garden) == 0 {
+		geo.Width = 0
+	}
 	clear(opts.IO)
 	drawGarden(out, garden, player)
 
diff --git a/pkg/cmd/repo/garden/http.go b/pkg/cmd/repo/garden/http.go
index ff7f47fe0..3e4bfa799 100644
--- a/pkg/cmd/repo/garden/http.go
+++ b/pkg/cmd/repo/garden/http.go
@@ -53,7 +53,7 @@ func getCommits(client *http.Client, repo ghrepo.Interface, maxCommits int) ([]*
 			})
 		}
 		link := resp.Header["Link"]
-		if !strings.Contains(link[0], "last") {
+		if len(link) == 0 || !strings.Contains(link[0], "last") {
 			paginating = false
 		}
 		page++