--- rxvt-unicode/src/rxvtperl.xs	2021/05/09 17:11:10	1.249
+++ rxvt-unicode/src/rxvtperl.xs	2021/07/14 12:39:57	1.251
@@ -1569,9 +1569,8 @@
 	CODE:
 {
         RETVAL = THIS->view_start;
-
-        if (newval <= 0)
-          THIS->scr_changeview (max (newval, THIS->top_row));
+        if (items > 1)
+          THIS->scr_changeview (newval);
 }
         OUTPUT:
 	RETVAL
@@ -1791,7 +1790,7 @@
           if (*s == NOCHAR)
             ;
           else if (IS_COMPOSE (*s))
-            dlen += rxvt_composite.expand (*s, 0);
+            dlen += rxvt_composite.expand (*s);
           else
             dlen++;