diff --git a/src/optionstr.c b/src/optionstr.c
index c049b3b..8b000ab 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -4510,7 +4510,8 @@
 #endif
 
     if (curwin->w_curswant != MAXCOL
-		   && (get_option_flags(opt_idx) & (P_CURSWANT | P_RALL)) != 0)
+		   && (get_option_flags(opt_idx) & (P_CURSWANT | P_RALL)) != 0
+				&& (get_option_flags(opt_idx) & P_HLONLY) == 0)
 	curwin->w_set_curswant = TRUE;
 
     if ((opt_flags & OPT_NO_REDRAW) == 0)