diff --git a/demo/client.ts b/demo/client.ts
index 83d9b8419..ca0fb1da7 100644
--- a/demo/client.ts
+++ b/demo/client.ts
@@ -45,8 +45,6 @@ let socketURL;
 let socket;
 let pid;
 
-(<any>window).webgl = () => term.loadAddon(new WebglAddon());
-
 const terminalContainer = document.getElementById('terminal-container');
 const actionElements = {
   findNext: <HTMLInputElement>document.querySelector('#find-next'),
@@ -91,6 +89,7 @@ if (document.location.pathname === '/test') {
 } else {
   createTerminal();
   document.getElementById('dispose').addEventListener('click', disposeRecreateButtonHandler);
+  document.getElementById('webgl').addEventListener('click', () => term.loadAddon(new WebglAddon()));
 }
 
 function createTerminal(): void {
diff --git a/demo/index.html b/demo/index.html
index 7a939da51..28ce91ce5 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -36,6 +36,7 @@
     <hr/>
     <p><strong>Attention:</strong> The demo is a barebones implementation and is designed for the development and evaluation of xterm.js only. Exposing the demo to the public as is would introduce security risks for the host.</p>
     <button id="dispose" title="This is used to testing memory leaks">Dispose terminal</button>
+    <button id="webgl"">Enable WebGL Renderr</button>
     <script src="dist/client-bundle.js" defer ></script>
   </body>
 </html>