diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index bc1fad71..2897c488 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -186,6 +186,7 @@ MAIN_WINDOW_REC *mainwindow_create(void)
 
 	rec = g_new0(MAIN_WINDOW_REC, 1);
 	rec->dirty = TRUE;
+#if 0
 	rec->width = term_width;
 	rec->first_column = 0;
 	rec->last_column = rec->first_column + rec->width;
@@ -212,6 +213,31 @@ MAIN_WINDOW_REC *mainwindow_create(void)
 		parent->first_line += space+1;
 		mainwindow_resize(parent, 0, -space-1);
 	}
+#else
+	rec->first_line = screen_reserved_top;
+	rec->last_line = term_height-1 - screen_reserved_bottom;
+	rec->height = rec->last_line-rec->first_line+1;
+
+	if (mainwindows == NULL) {
+		active_mainwin = rec;
+
+		rec->first_column = 0;
+		rec->last_column = term_width - 1;
+		rec->width = rec->last_column - rec->first_column + 1;
+
+	} else {
+		parent = WINDOW_MAIN(active_win);
+
+		space = parent->width / 2;
+		rec->first_column = parent->first_column;
+		rec->last_column = rec->first_column + space;
+		rec->width = rec->last_column - rec->first_column + 1;
+
+		parent->first_column += space + 1;
+
+		mainwindow_resize(parent, -space-1, 0);
+	}
+#endif
 
 	rec->screen_win = mainwindow_create_screen(rec);
 	term_refresh(NULL);
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
index e39468af..6285d4ff 100644
--- a/src/fe-text/term-terminfo.c
+++ b/src/fe-text/term-terminfo.c
@@ -565,10 +565,10 @@ void term_clrtoeol(TERM_WINDOW *window)
 			terminfo_clrtoeol();
 			if (vcx == 0) term_lines_empty[vcy] = TRUE;
 		}
-	} else if (vcx < window->width) {
+	} else if (vcx < window->x + window->width) {
 		/* we'll need to fill the line ourself. */
 		if (vcmove) term_move_real();
-		terminfo_repeat(' ', window->width - vcx);
+		terminfo_repeat(' ', window->x + window->width - vcx);
 		terminfo_move(vcx, vcy);
                 term_lines_empty[vcy] = FALSE;
 	}