diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs
index 924babf6..b2d517c4 100644
--- a/src/tests/e2e/remote_runner.rs
+++ b/src/tests/e2e/remote_runner.rs
@@ -496,6 +496,6 @@ impl RemoteRunner {
 
 impl Drop for RemoteRunner {
     fn drop(&mut self) {
-        self.channel.close().unwrap();
+        let _ = self.channel.close();
     }
 }
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index f157b327..1cbd73de 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -843,7 +843,13 @@ impl Grid {
         }
     }
     pub fn fill_viewport(&mut self, character: TerminalCharacter) {
-        self.viewport.clear();
+        let row_count_to_transfer = self.viewport.len();
+        transfer_rows_from_viewport_to_lines_above(
+            &mut self.viewport,
+            &mut self.lines_above,
+            row_count_to_transfer,
+            self.width,
+        );
         for _ in 0..self.height {
             let columns = vec![character; self.width];
             self.viewport.push(Row::from_columns(columns).canonical());