diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c
index 2d895bd43fc7acbd5e790890df8c44878b063ae4..4193600db3087feefa238e7370e7986e8552b53b 100644
--- a/src/syncterm/bbslist.c
+++ b/src/syncterm/bbslist.c
@@ -755,6 +755,40 @@ struct bbslist *show_bbslist(char* listpath, int mode, char *home)
 					case 0:			/* Edit default connection settings */
 						edit_list(&defaults,listpath,TRUE);
 						break;
+					case 2: {		/* Screen Setup */
+							struct text_info ti;
+							gettextinfo(&ti);
+
+							uifc.helpbuf=	"`Screen Setup`\n\n"
+									"Select the new screen size.\n";
+							i=ti.currmode;
+							i=uifc.list(WIN_SAV,0,0,0,&i,NULL,"Screen Setup",screen_modes);
+							if(i>=0) {
+								uifcbail();
+								switch(i) {
+									case SCREEN_MODE_80X25:
+										textmode(C80);
+										break;
+									case SCREEN_MODE_80X28:
+										textmode(C80X28);
+										break;
+									case SCREEN_MODE_80X43:
+										textmode(C80X43);
+										break;
+									case SCREEN_MODE_80X50:
+										textmode(C80X50);
+										break;
+									case SCREEN_MODE_80X60:
+										textmode(C80X60);
+										break;
+								}
+								init_uifc(TRUE, TRUE);
+							}
+							val=uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
+								|WIN_T2B|WIN_IMM|WIN_INACT
+								,0,0,0,&opt,&bar,mode==BBSLIST_SELECT?"Directory":"Edit",(char **)list);
+						}
+						break;
 				}
 			}
 		}
diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c
index f4db09085ba623f27be0bfedbb79d7da36ea2196..53b4be973737dcddacd1fa90d1783a3c7b605129 100644
--- a/src/syncterm/syncterm.c
+++ b/src/syncterm/syncterm.c
@@ -309,6 +309,7 @@ int main(int argc, char **argv)
 		return(1);
 
 	while(bbs!=NULL || (bbs=show_bbslist(listpath,BBSLIST_SELECT,home))!=NULL) {
+    		gettextinfo(&txtinfo);	/* Current mode may have changed while in show_bbslist() */
 		if(!conn_connect(bbs->addr,bbs->port,bbs->reversed?bbs->password:bbs->user,bbs->reversed?bbs->user:bbs->password,bbs->syspass,bbs->conn_type,bbs->bpsrate)) {
 			/* ToDo: Update the entry with new lastconnected */
 			/* ToDo: Disallow duplicate entries */