diff --git a/src/Terminal.ts b/src/Terminal.ts
index 61c997bd..54863ce0 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -27,7 +27,7 @@ import { CompositionHelper } from 'browser/input/CompositionHelper';
 import { Viewport } from 'browser/Viewport';
 import { rightClickHandler, moveTextAreaUnderMouseCursor, handlePasteEvent, copyHandler, paste } from 'browser/Clipboard';
 import { C0 } from 'common/data/EscapeSequences';
-import { InputHandler, WindowsOptionsReportType } from './common/InputHandler';
+import { WindowsOptionsReportType } from './common/InputHandler';
 import { Renderer } from 'browser/renderer/Renderer';
 import { Linkifier } from 'browser/Linkifier';
 import { SelectionService } from 'browser/services/SelectionService';
@@ -49,7 +49,6 @@ import { ICharSizeService, IRenderService, IMouseService, ISelectionService, ISo
 import { CharSizeService } from 'browser/services/CharSizeService';
 import { IBuffer } from 'common/buffer/Types';
 import { MouseService } from 'browser/services/MouseService';
-import { IParams, IFunctionIdentifier } from 'common/parser/Types';
 import { ILinkifier, IMouseZoneManager, LinkMatcherHandler, ILinkMatcherOptions, IViewport, ILinkifier2 } from 'browser/Types';
 import { WriteBuffer } from 'common/input/WriteBuffer';
 import { Linkifier2 } from 'browser/Linkifier2';
@@ -100,7 +99,6 @@ export class Terminal extends CoreTerminal implements ITerminal {
    */
   private _keyDownHandled: boolean = false;
 
-  private _inputHandler: InputHandler;
   public linkifier: ILinkifier;
   public linkifier2: ILinkifier2;
   public viewport: IViewport;
@@ -154,6 +152,16 @@ export class Terminal extends CoreTerminal implements ITerminal {
 
     this._setup();
 
+    this.register(this._inputHandler.onRequestBell(() => this.bell()));
+    this.register(this._inputHandler.onRequestRefreshRows((start, end) => this.refresh(start, end)));
+    this.register(this._inputHandler.onRequestReset(() => this.reset()));
+    this.register(this._inputHandler.onRequestScroll((eraseAttr, isWrapped) => this.scroll(eraseAttr, isWrapped || undefined)));
+    this.register(this._inputHandler.onRequestWindowsOptionsReport(type => this._reportWindowsOptions(type)));
+    this.register(forwardEvent(this._inputHandler.onCursorMove, this._onCursorMove));
+    this.register(forwardEvent(this._inputHandler.onTitleChange, this._onTitleChange));
+    this.register(forwardEvent(this._inputHandler.onA11yChar, this._onA11yCharEmitter));
+    this.register(forwardEvent(this._inputHandler.onA11yTab, this._onA11yTabEmitter));
+
     // Setup listeners
     this._bufferService.onResize(e => this._afterResize(e.cols, e.rows));
 
@@ -172,24 +180,6 @@ export class Terminal extends CoreTerminal implements ITerminal {
   }
 
   protected _setup(): void {
-    if (this._inputHandler) {
-      this._inputHandler.reset();
-    } else {
-      // Register input handler and refire/handle events
-      this._inputHandler = new InputHandler(this._bufferService, this._charsetService, this._coreService, this._dirtyRowService, this._logService, this.optionsService, this._coreMouseService, this.unicodeService);
-      this.register(this._inputHandler.onRequestBell(() => this.bell()));
-      this.register(this._inputHandler.onRequestRefreshRows((start, end) => this.refresh(start, end)));
-      this.register(this._inputHandler.onRequestReset(() => this.reset()));
-      this.register(this._inputHandler.onRequestScroll((eraseAttr, isWrapped) => this.scroll(eraseAttr, isWrapped || undefined)));
-      this.register(this._inputHandler.onRequestWindowsOptionsReport(type => this._reportWindowsOptions(type)));
-      this.register(forwardEvent(this._inputHandler.onCursorMove, this._onCursorMove));
-      this.register(forwardEvent(this._inputHandler.onLineFeed, this._onLineFeed));
-      this.register(forwardEvent(this._inputHandler.onTitleChange, this._onTitleChange));
-      this.register(forwardEvent(this._inputHandler.onA11yChar, this._onA11yCharEmitter));
-      this.register(forwardEvent(this._inputHandler.onA11yTab, this._onA11yTabEmitter));
-      this.register(this._inputHandler);
-    }
-
     super._setup();
 
     this._customKeyEventHandler = null;
@@ -986,25 +976,6 @@ export class Terminal extends CoreTerminal implements ITerminal {
     this._customKeyEventHandler = customKeyEventHandler;
   }
 
-  /** Add handler for ESC escape sequence. See xterm.d.ts for details. */
-  public addEscHandler(id: IFunctionIdentifier, callback: () => boolean): IDisposable {
-    return this._inputHandler.addEscHandler(id, callback);
-  }
-
-  /** Add handler for DCS escape sequence. See xterm.d.ts for details. */
-  public addDcsHandler(id: IFunctionIdentifier, callback: (data: string, param: IParams) => boolean): IDisposable {
-    return this._inputHandler.addDcsHandler(id, callback);
-  }
-
-  /** Add handler for CSI escape sequence. See xterm.d.ts for details. */
-  public addCsiHandler(id: IFunctionIdentifier, callback: (params: IParams) => boolean): IDisposable {
-    return this._inputHandler.addCsiHandler(id, callback);
-  }
-  /** Add handler for OSC escape sequence. See xterm.d.ts for details. */
-  public addOscHandler(ident: number, callback: (data: string) => boolean): IDisposable {
-    return this._inputHandler.addOscHandler(ident, callback);
-  }
-
   /**
    * Registers a link matcher, allowing custom link patterns to be matched and
    * handled.
@@ -1337,6 +1308,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
     const userScrolling = this._userScrolling;
 
     this._setup();
+    this._inputHandler.reset();
     this._bufferService.reset();
     this._charsetService.reset();
     this._coreService.reset();
diff --git a/src/common/CoreTerminal.ts b/src/common/CoreTerminal.ts
index 49f3509d..8df2bd6b 100644
--- a/src/common/CoreTerminal.ts
+++ b/src/common/CoreTerminal.ts
@@ -27,7 +27,7 @@ import { InstantiationService } from 'common/services/InstantiationService';
 import { LogService } from 'common/services/LogService';
 import { BufferService, MINIMUM_COLS, MINIMUM_ROWS } from 'common/services/BufferService';
 import { OptionsService } from 'common/services/OptionsService';
-import { ITerminalOptions, IDisposable } from './Types';
+import { ITerminalOptions, IDisposable } from 'common/Types';
 import { CoreService } from 'common/services/CoreService';
 import { EventEmitter, IEvent, forwardEvent } from 'common/EventEmitter';
 import { CoreMouseService } from 'common/services/CoreMouseService';
@@ -37,6 +37,7 @@ import { CharsetService } from 'common/services/CharsetService';
 import { updateWindowsModeWrappedState } from 'common/WindowsMode';
 import { IFunctionIdentifier, IParams } from 'common/parser/Types';
 import { IBufferSet } from 'common/buffer/Types';
+import { InputHandler } from 'common/InputHandler';
 
 export abstract class CoreTerminal extends Disposable {
   protected readonly _instantiationService: IInstantiationService;
@@ -50,6 +51,7 @@ export abstract class CoreTerminal extends Disposable {
   public readonly unicodeService: IUnicodeService;
   public readonly optionsService: IOptionsService;
 
+  protected _inputHandler: InputHandler;
   private _windowsMode: IDisposable | undefined;
 
   private _onBinary = new EventEmitter<string>();
@@ -94,6 +96,11 @@ export abstract class CoreTerminal extends Disposable {
     this.register(forwardEvent(this._coreService.onData, this._onData));
     this.register(forwardEvent(this._coreService.onBinary, this._onBinary));
     this.register(this.optionsService.onOptionChange(key => this._updateOptions(key)));
+
+    // Register input handler and handle/forward events
+    this._inputHandler = new InputHandler(this._bufferService, this._charsetService, this._coreService, this._dirtyRowService, this._logService, this.optionsService, this._coreMouseService, this.unicodeService);
+    this.register(forwardEvent(this._inputHandler.onLineFeed, this._onLineFeed));
+    this.register(this._inputHandler);
   }
 
   public dispose(): void {
@@ -116,6 +123,26 @@ export abstract class CoreTerminal extends Disposable {
     this._bufferService.resize(x, y);
   }
 
+  /** Add handler for ESC escape sequence. See xterm.d.ts for details. */
+  public addEscHandler(id: IFunctionIdentifier, callback: () => boolean): IDisposable {
+    return this._inputHandler.addEscHandler(id, callback);
+  }
+
+  /** Add handler for DCS escape sequence. See xterm.d.ts for details. */
+  public addDcsHandler(id: IFunctionIdentifier, callback: (data: string, param: IParams) => boolean): IDisposable {
+    return this._inputHandler.addDcsHandler(id, callback);
+  }
+
+  /** Add handler for CSI escape sequence. See xterm.d.ts for details. */
+  public addCsiHandler(id: IFunctionIdentifier, callback: (params: IParams) => boolean): IDisposable {
+    return this._inputHandler.addCsiHandler(id, callback);
+  }
+
+  /** Add handler for OSC escape sequence. See xterm.d.ts for details. */
+  public addOscHandler(ident: number, callback: (data: string) => boolean): IDisposable {
+    return this._inputHandler.addOscHandler(ident, callback);
+  }
+
   protected _setup(): void {
     if (this.optionsService.options.windowsMode) {
       this._enableWindowsMode();
@@ -156,5 +183,4 @@ export abstract class CoreTerminal extends Disposable {
   }
 
   public abstract scrollToBottom(): void;
-  public abstract addCsiHandler(id: IFunctionIdentifier, callback: (params: IParams) => boolean): IDisposable;
 }