diff --git a/demo/app.js b/demo/app.js
index 0c137a1d..87c4a6ef 100644
--- a/demo/app.js
+++ b/demo/app.js
@@ -25,6 +25,10 @@ app.get('/zmodemjs/*.js', function(req, res){
     res.sendFile(__dirname + req.url);
 });
 
+app.get('/js/*.js', function(req, res){
+    res.sendFile(__dirname + req.url);
+});
+
 app.post('/terminals', function (req, res) {
   var cols = parseInt(req.query.cols),
       rows = parseInt(req.query.rows),
diff --git a/demo/index.html b/demo/index.html
index 492dca1b..109a7bd3 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -13,6 +13,9 @@
         <script src="/build/addons/fullscreen/fullscreen.js" ></script>
         <script src="/build/addons/search/search.js" ></script>
 
+        <!-- Edge needs this, as of late 2017 -->
+        <script src="/js/text-encoding.js"></script>
+
         <script src="/zmodemjs/zmodem.js"></script>
     </head>
     <body>
@@ -21,7 +24,7 @@
 <div id="zmodem_controls">
     <form id="zm_start" style="display: none" action="javascript:void(0)">
         ZMODEM detected: Start ZMODEM session?
-        <label><input name="zmstart" type=radio checked value="1"> Yes</label>
+        <label><input id="zmstart_yes" name="zmstart" type=radio checked value="1"> Yes</label>
         &nbsp;
         <label><input name="zmstart" type=radio value=""> No</label>
         <button type="submit">Submit</button>
@@ -39,7 +42,7 @@
     <form id="zm_offer" style="display: none" action="javascript:void(0)">
         <p>ZMODEM File offered!</p>
 
-        <label><input name="zmaccept" type=radio checked value="1"> Accept</label>
+        <label><input id="zmaccept_yes" name="zmaccept" type=radio checked value="1"> Accept</label>
         &nbsp;
         <label><input name="zmaccept" type=radio value=""> Skip</label>
         <button type="submit">Submit</button>
diff --git a/demo/js/formdata.min.js b/demo/js/formdata.min.js
new file mode 120000
index 00000000..efdf071c
--- /dev/null
+++ b/demo/js/formdata.min.js
@@ -0,0 +1 @@
+../../node_modules/formdata-polyfill/formdata.min.js
\ No newline at end of file
diff --git a/demo/js/text-encoding.js b/demo/js/text-encoding.js
new file mode 120000
index 00000000..5214c1c7
--- /dev/null
+++ b/demo/js/text-encoding.js
@@ -0,0 +1 @@
+../../node_modules/text-encoding/lib/encoding.js
\ No newline at end of file
diff --git a/demo/main.js b/demo/main.js
index 017a3127..a0f64b9d 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -168,10 +168,12 @@ function _handle_receive_session(zsession) {
         var offer_form = document.getElementById("zm_offer");
         offer_form.style.display = "";
         offer_form.onsubmit = function(e) {
-            offer_form.style.display = "none";
+            var the_form = e.currentTarget;
+            the_form.style.display = "none";
 
             //START
-            if (offer_form.zmaccept.value) {
+            //if (offer_form.zmaccept.value) {
+            if (document.getElementById("zmaccept_yes").checked) {
                 var FILE_BUFFER = [];
                 xfer.on("input", (payload) => {
                     _update_progress(xfer);
@@ -259,7 +261,7 @@ var zsentry = new Zmodem.Sentry( {
         start_form.onsubmit = function(e) {
             start_form.style.display = "none";
 
-            if (e.currentTarget.zmstart.value) {
+            if (document.getElementById("zmstart_yes").checked) {
                 let zsession = detection.confirm();
 
                 current_zsession = zsession;
diff --git a/package.json b/package.json
index eda89128..636b51d2 100644
--- a/package.json
+++ b/package.json
@@ -78,5 +78,8 @@
     "build": "gulp build; cd demo/zmodemjs; npm install",
     "prepublish": "npm run build",
     "coveralls": "gulp coveralls"
+  },
+  "dependencies": {
+    "text-encoding": "^0.6.4"
   }
 }
