diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ea9ee26..6ed3a709 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.16.5
+------
+- Minor bug fixes
+- Added `toggle-preview-wrap` action
+
 0.16.4
 ------
 - Added `--border` option to draw border above and below the finder
diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 3d33d436..03136c15 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -500,6 +500,7 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
     \fBtoggle-in\fR             (\fB--reverse\fR ? \fBtoggle+up\fR : \fBtoggle+down\fR)
     \fBtoggle-out\fR            (\fB--reverse\fR ? \fBtoggle+down\fR : \fBtoggle+up\fR)
     \fBtoggle-preview\fR
+    \fBtoggle-preview-wrap\fR
     \fBtoggle-sort\fR
     \fBtoggle+up\fR             \fIbtab    (shift-tab)\fR
     \fBunix-line-discard\fR     \fIctrl-u\fR
diff --git a/src/options.go b/src/options.go
index 30cc7519..c78d2bfe 100644
--- a/src/options.go
+++ b/src/options.go
@@ -723,6 +723,8 @@ func parseKeymap(keymap map[int][]action, str string) {
 				appendAction(actNextHistory)
 			case "toggle-preview":
 				appendAction(actTogglePreview)
+			case "toggle-preview-wrap":
+				appendAction(actTogglePreviewWrap)
 			case "toggle-sort":
 				appendAction(actToggleSort)
 			case "preview-up":
diff --git a/src/terminal.go b/src/terminal.go
index f75480e6..d056c1a0 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -199,6 +199,7 @@ const (
 	actPrintQuery
 	actToggleSort
 	actTogglePreview
+	actTogglePreviewWrap
 	actPreviewUp
 	actPreviewDown
 	actPreviewPageUp
@@ -1459,6 +1460,11 @@ func (t *Terminal) Loop() {
 					}
 					req(reqList, reqInfo, reqHeader)
 				}
+			case actTogglePreviewWrap:
+				if t.hasPreviewWindow() {
+					t.preview.wrap = !t.preview.wrap
+					req(reqPreviewRefresh)
+				}
 			case actToggleSort:
 				t.sort = !t.sort
 				t.eventBox.Set(EvtSearchNew, t.sort)
diff --git a/src/tui/light.go b/src/tui/light.go
index 37fcc122..fb8f4f03 100644
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -596,7 +596,7 @@ func (r *LightRenderer) MaxY() int {
 }
 
 func (r *LightRenderer) DoesAutoWrap() bool {
-	return true
+	return false
 }
 
 func (r *LightRenderer) IsOptimized() bool {