diff --git a/tui/commands.go b/tui/commands.go
index a02fc8a1474951108d0fd1fd62f3056385d50a46..173e1d89d2f47d0b6f0d6b8aea23291c703c6926 100644
--- a/tui/commands.go
+++ b/tui/commands.go
@@ -50,7 +50,10 @@ func (b *Bubble) setupCmd() tea.Msg {
 		}
 		width := b.width
 		boxLeftWidth := menuStyle.GetWidth() + menuStyle.GetHorizontalFrameSize()
-		const heightMargin = 12 // TODO: figure out why this needs to be 12
+		// TODO: also send this along with a tea.WindowSizeMsg
+		var heightMargin = lipgloss.Height(b.headerView()) +
+			lipgloss.Height(b.footerView()) +
+			contentBoxStyle.GetVerticalFrameSize()
 		rb := repo.NewBubble(b.repoSource, me.Repo, width, boxLeftWidth, b.height, heightMargin, tmplConfig)
 		initCmd := rb.Init()
 		msg := initCmd()