diff --git a/viewport/viewport.go b/viewport/viewport.go
index 85323ee..149f5ab 100644
--- a/viewport/viewport.go
+++ b/viewport/viewport.go
@@ -152,7 +152,7 @@ func (m Model) visibleLines() (lines []string) {
 		lines = m.lines[top:bottom]
 	}
 
-	if m.xOffset == 0 && m.longestLineWidth <= m.Width {
+	if (m.xOffset == 0 && m.longestLineWidth <= m.Width) || m.Width == 0 {
 		return lines
 	}
 
diff --git a/viewport/viewport_test.go b/viewport/viewport_test.go
index c90499a..ef70a54 100644
--- a/viewport/viewport_test.go
+++ b/viewport/viewport_test.go
@@ -208,7 +208,7 @@ func TestVisibleLines(t *testing.T) {
 		numberOfLines := 10
 
 		m := New(10, numberOfLines)
-		m.lines = defaultList
+		m.SetContent(strings.Join(defaultList, "\n"))
 
 		list := m.visibleLines()
 		if len(list) != numberOfLines {
@@ -228,7 +228,7 @@ func TestVisibleLines(t *testing.T) {
 		numberOfLines := 10
 
 		m := New(10, numberOfLines)
-		m.lines = defaultList
+		m.SetContent(strings.Join(defaultList, "\n"))
 		m.YOffset = 5
 
 		list := m.visibleLines()