diff --git a/src/renderer/BackgroundRenderLayer.ts b/src/renderer/BackgroundRenderLayer.ts
index 729a8ec5f..292847c2d 100644
--- a/src/renderer/BackgroundRenderLayer.ts
+++ b/src/renderer/BackgroundRenderLayer.ts
@@ -15,6 +15,8 @@ export class BackgroundRenderLayer extends BaseRenderLayer {
 
   public resize(terminal: ITerminal, canvasWidth: number, canvasHeight: number, charSizeChanged: boolean): void {
     super.resize(terminal, canvasWidth, canvasHeight, charSizeChanged);
+    // Resizing the canvas discards the contents of the canvas so clear state
+    this._state.clear();
     this._state.resize(terminal.cols, terminal.rows);
   }
 
diff --git a/src/renderer/CursorRenderLayer.ts b/src/renderer/CursorRenderLayer.ts
index cc443b497..482d4e148 100644
--- a/src/renderer/CursorRenderLayer.ts
+++ b/src/renderer/CursorRenderLayer.ts
@@ -43,6 +43,18 @@ export class CursorRenderLayer extends BaseRenderLayer {
     // TODO: Consider initial options? Maybe onOptionsChanged should be called at the end of open?
   }
 
+  public resize(terminal: ITerminal, canvasWidth: number, canvasHeight: number, charSizeChanged: boolean): void {
+    super.resize(terminal, canvasWidth, canvasHeight, charSizeChanged);
+    // Resizing the canvas discards the contents of the canvas so clear state
+    this._state = {
+      x: null,
+      y: null,
+      isFocused: null,
+      style: null,
+      width: null,
+    };
+  }
+
   public reset(terminal: ITerminal): void {
     this._clearCursor();
     if (this._cursorBlinkStateManager) {
diff --git a/src/renderer/ForegroundRenderLayer.ts b/src/renderer/ForegroundRenderLayer.ts
index 1f579f91a..e8835dea6 100644
--- a/src/renderer/ForegroundRenderLayer.ts
+++ b/src/renderer/ForegroundRenderLayer.ts
@@ -16,6 +16,8 @@ export class ForegroundRenderLayer extends BaseRenderLayer {
 
   public resize(terminal: ITerminal, canvasWidth: number, canvasHeight: number, charSizeChanged: boolean): void {
     super.resize(terminal, canvasWidth, canvasHeight, charSizeChanged);
+    // Resizing the canvas discards the contents of the canvas so clear state
+    this._state.clear();
     this._state.resize(terminal.cols, terminal.rows);
   }
 
diff --git a/src/renderer/SelectionRenderLayer.ts b/src/renderer/SelectionRenderLayer.ts
index 1dcb8ab6a..7f131da80 100644
--- a/src/renderer/SelectionRenderLayer.ts
+++ b/src/renderer/SelectionRenderLayer.ts
@@ -16,6 +16,15 @@ export class SelectionRenderLayer extends BaseRenderLayer {
     };
   }
 
+  public resize(terminal: ITerminal, canvasWidth: number, canvasHeight: number, charSizeChanged: boolean): void {
+    super.resize(terminal, canvasWidth, canvasHeight, charSizeChanged);
+    // Resizing the canvas discards the contents of the canvas so clear state
+    this._state = {
+      start: null,
+      end: null
+    };
+  }
+
   public reset(terminal: ITerminal): void {
     if (this._state.start && this._state.end) {
       this._state = {
diff --git a/src/utils/TestUtils.test.ts b/src/utils/TestUtils.test.ts
index 46a226a23..d4dc16ab0 100644
--- a/src/utils/TestUtils.test.ts
+++ b/src/utils/TestUtils.test.ts
@@ -5,6 +5,7 @@
 import { ITerminal, IBuffer, IBufferSet, IBrowser, ICharMeasure, ISelectionManager, ITerminalOptions, IListenerType, IInputHandlingTerminal, IViewport, ICircularList, ICompositionHelper } from '../Interfaces';
 import { LineData } from '../Types';
 import * as Browser from './Browser';
+import { IColorSet } from '../renderer/Interfaces';
 
 export class MockTerminal implements ITerminal {
   isFocused: boolean;
@@ -180,6 +181,7 @@ export class MockInputHandlingTerminal implements IInputHandlingTerminal {
 }
 
 export class MockBuffer implements IBuffer {
+  isCursorInViewport: boolean;
   lines: ICircularList<[number, string, number][]>;
   ydisp: number;
   ybase: number;