diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index deab8de8..5f24674f 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1214,6 +1214,8 @@ void mainwindows_redraw_dirty(void)
 		if (rec->dirty) {
                         rec->dirty = FALSE;
 			gui_window_redraw(rec->active);
+		} else if (WINDOW_GUI(rec->active)->view->dirty) {
+			gui_window_redraw(rec->active);
 		}
 	}
 }
diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c
index b503ec73..b7fdcb7d 100644
--- a/src/fe-text/textbuffer-view.c
+++ b/src/fe-text/textbuffer-view.c
@@ -854,7 +854,8 @@ static int view_scroll(TEXT_BUFFER_VIEW_REC *view, LINE_REC **lines,
 				/* do not bother with vt400 scroll
 				   rectangles for now, redraw the
 				   whole view */
-				textbuffer_view_redraw(view);
+				view->dirty = TRUE;
+				irssi_set_dirty();
 			}
 		}
 	}