diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd978f3e..f5b9954e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.15.3
+------
+- Added support for more ANSI attributes: dim, underline, blink, and reverse
+- Fixed race condition in `toggle-preview`
+
 0.15.2
 ------
 - Preview window is now scrollable
diff --git a/src/terminal.go b/src/terminal.go
index 14dcd28f..02fe7317 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -796,6 +796,9 @@ func numLinesMax(str string, max int) int {
 }
 
 func (t *Terminal) printPreview() {
+	if !t.isPreviewEnabled() {
+		return
+	}
 	t.pwindow.Erase()
 	skip := t.previewer.offset
 	extractColor(t.previewer.text, nil, func(str string, ansi *ansiState) bool {
@@ -839,9 +842,7 @@ func (t *Terminal) printAll() {
 	t.printPrompt()
 	t.printInfo()
 	t.printHeader()
-	if t.isPreviewEnabled() {
-		t.printPreview()
-	}
+	t.printPreview()
 }
 
 func (t *Terminal) refresh() {