diff --git a/demo/client.ts b/demo/client.ts
index a3a912f630..70996c4a75 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -30,7 +30,10 @@ Terminal.applyAddon(fit);
 Terminal.applyAddon(fullscreen);
 Terminal.applyAddon(search);
 Terminal.applyAddon(webLinks);
-Terminal.applyAddon(winptyCompat);
+const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
+if (isWindows) {
+  Terminal.applyAddon(winptyCompat);
+}
 
 
 let term;
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 4a85758f06..c2497df440 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -343,7 +343,7 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
    */
   public focus(): void {
     if (this.textarea) {
-      this.textarea.focus();
+      this.textarea.focus({ preventScroll: true });
     }
   }
 
diff --git a/src/addons/winptyCompat/winptyCompat.ts b/src/addons/winptyCompat/winptyCompat.ts
index d162f4e921..58f59fd907 100644
--- a/src/addons/winptyCompat/winptyCompat.ts
+++ b/src/addons/winptyCompat/winptyCompat.ts
@@ -13,12 +13,6 @@ const WHITESPACE_CELL_CODE = 32;
 export function winptyCompatInit(terminal: Terminal): void {
   const addonTerminal = <IWinptyCompatAddonTerminal>terminal;
 
-  // Don't do anything when the platform is not Windows
-  const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
-  if (!isWindows) {
-    return;
-  }
-
   (addonTerminal._core as any).isWinptyCompatEnabled = true;
 
   // Winpty does not support wraparound mode which means that lines will never
diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index b8ef87aab4..2c1b516ae5 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -85,6 +85,7 @@ export class Renderer extends EventEmitter implements IRenderer {
     this._isPaused = entry.intersectionRatio === 0;
     if (!this._isPaused && this._needsFullRefresh) {
       this._terminal.refresh(0, this._terminal.rows - 1);
+      this._needsFullRefresh = false;
     }
   }