diff --git a/display.c b/display.c
index 70b8758..ea43125 100644
--- a/display.c
+++ b/display.c
@@ -1327,6 +1327,12 @@ static void sizesignal( int signr) {
 static void newscreensize( int h, int w) {
 	chg_width = chg_height = 0 ;
 	vtfree() ;
+	if( h < 3)
+		h = 3 ;
+
+	if( w < 10)
+		w = 10 ;
+
 	vtalloc( h, w) ;
 	if( h <= term.t_mrow)
 		newsize( TRUE, h) ;
diff --git a/names.c b/names.c
index 132c98d..bc95c15 100644
--- a/names.c
+++ b/names.c
@@ -50,7 +50,7 @@ const name_bind names[] = {
 	{"!case-word-lower", lowerword,					META | 'L'} ,
 	{"!case-word-upper", upperword,					META | 'U'} ,
 	{" change-file-name", filename,					CTLX | 'N'} ,
-	{" change-screen-size", newsize,				META | CTL_ | 'D'} , /* M^S */
+	{" change-screen-size", (fnp_t) newsize,		META | CTL_ | 'D'} , /* M^S */
 	{" change-screen-width", (fnp_t) newwidth,		META | CTL_ | 'T'} ,
 	{" clear-and-redraw", (fnp_t) redraw,			CTL_ | 'L'} ,
 	{" clear-message-line", (fnp_t) clrmes, 		0} ,
diff --git a/window.c b/window.c
index 8236ae7..959f846 100644
--- a/window.c
+++ b/window.c
@@ -566,84 +566,80 @@ BINDABLE( restwnd) {
  * int f;	default flag
  * int n;	numeric argument
  */
-BINDABLE( newsize) {
-	window_p wp;		/* current window being examined */
-	window_p nextwp;	/* next window to scan */
-	window_p lastwp;	/* last window scanned */
-	int lastline;		/* screen line of last line of current window */
+BBINDABLE( newsize) {
+	window_p wp ;		/* current window being examined */
 
 	/* if the command defaults, assume the largest */
-	if (f == FALSE)
+	if( f == FALSE)
 		n = term.t_mrow ;
 
 	/* make sure it's in range */
 	if( n < 3 || n > term.t_mrow)
 		return mloutfail( "%%Screen size out of range") ;
 
-	if (term.t_nrow == n - 1)
-		return TRUE;
-	else if (term.t_nrow < n - 1) {
-
+	if( term.t_nrow == n - 1)
+	/* no change */
+		return TRUE ;
+	else if( term.t_nrow < n - 1) {
+	/* new size is bigger */
 		/* go to the last window */
-		wp = wheadp;
-		while (wp->w_wndp != NULL)
-			wp = wp->w_wndp;
+		for( wp = wheadp ; wp->w_wndp != NULL ; wp = wp->w_wndp)
+			;
 
 		/* and enlarge it as needed */
-		wp->w_ntrows = n - wp->w_toprow - 2;
-		wp->w_flag |= WFHARD | WFMODE;
-
+		wp->w_ntrows = n - wp->w_toprow - 2 ;
+		wp->w_flag |= WFHARD | WFMODE ;
 	} else {
-
+	/* new size is smaller */
 		/* rebuild the window structure */
 		assert( wheadp->w_toprow == 0) ;	/* proves coverity wrong */
-		nextwp = wheadp;
-		wp = NULL;
-		lastwp = NULL;
-		while (nextwp != NULL) {
-			wp = nextwp;
-			nextwp = wp->w_wndp;
+		window_p lastwp = NULL ;
+		for( window_p nextwp = wheadp ; nextwp != NULL ; ) {
+			wp = nextwp ;
+			nextwp = wp->w_wndp ;
+
+			if( wp->w_toprow == n - 2) {
+				lastwp->w_ntrows = n - lastwp->w_toprow - 2 ;
+				lastwp->w_flag |= WFHARD | WFMODE ;
+			}
 
 			/* get rid of it if it is too low */
-			if (wp->w_toprow > n - 2) {
-
+			if( wp->w_toprow >= n - 2) {
 				/* save the point/mark if needed */
-				if (--wp->w_bufp->b_nwnd == 0) {
-					wp->w_bufp->b_dotp = wp->w_dotp;
-					wp->w_bufp->b_doto = wp->w_doto;
-					wp->w_bufp->b_markp = wp->w_markp;
-					wp->w_bufp->b_marko = wp->w_marko;
+				if( --wp->w_bufp->b_nwnd == 0) {
+					wp->w_bufp->b_dotp = wp->w_dotp ;
+					wp->w_bufp->b_doto = wp->w_doto ;
+					wp->w_bufp->b_markp = wp->w_markp ;
+					wp->w_bufp->b_marko = wp->w_marko ;
 				}
 
 				/* update curwp and lastwp if needed */
-				if (wp == curwp)
-					curwp = wheadp;
-				curbp = curwp->w_bufp;
-				if (lastwp != NULL)
-					lastwp->w_wndp = NULL;
+				if( wp == curwp) {
+					curwp = wheadp ;
+					curbp = curwp->w_bufp ;
+				}
 
 				/* free the structure */
-				free((char *) wp);
-				wp = NULL;
-
+				free( wp) ;
+				lastwp->w_wndp = NULL ;
 			} else {
-				/* need to change this window size? */
-				lastline = wp->w_toprow + wp->w_ntrows - 1;
-				if (lastline >= n - 2) {
-					wp->w_ntrows =
-					    n - wp->w_toprow - 2;
-					wp->w_flag |= WFHARD | WFMODE;
+			/* need to change this window size? */
+				int lastline = wp->w_toprow + wp->w_ntrows - 1 ;
+				if( lastline >= n - 2) {
+					wp->w_ntrows = n - wp->w_toprow - 2 ;
+					assert( wp->w_ntrows) ;
+					wp->w_flag |= WFHARD | WFMODE ;
 				}
-			}
 
-			lastwp = wp;
+				lastwp = wp ;
+			}
 		}
 	}
 
 	/* screen is garbage */
-	term.t_nrow = n - 1;
-	sgarbf = TRUE;
-	return TRUE;
+	term.t_nrow = n - 1 ;
+	sgarbf = TRUE ;
+	return TRUE ;
 }
 
 
diff --git a/window.h b/window.h
index ec684f4..a1e41b4 100644
--- a/window.h
+++ b/window.h
@@ -55,7 +55,7 @@ extern window_p wheadp ;    /* Head of list of windows      */
  BINDABLE( enlargewind) ;
  BINDABLE( mvdnwind) ;
  BINDABLE( mvupwind) ;
- BINDABLE( newsize) ;
+BBINDABLE( newsize) ;
 BBINDABLE( newwidth) ;
  BINDABLE( nextwind) ;
  BINDABLE( onlywind) ;