diff --git a/extension/README.md b/extension/README.md
index 0b9f2ae..e5e2509 100644
--- a/extension/README.md
+++ b/extension/README.md
@@ -14,7 +14,7 @@ Load the extension into chrome and find its ID (something like "pmmajlahjokcgkno
 Edit the "allowed_origins" in gowebserial_chrome.json so it matches the ID
 
 **Update the path in the app manifest**
-Edit the "path" in gowebserial.json (for Firefox) and/or gowebserial_chrome.json (for Chrome) to point to the go-webserial.exe file
+Edit the "path" in gowebserial_firefox.json (for Firefox) and/or gowebserial_chrome.json (for Chrome) to point to the go-webserial.exe file
 
 **Load the extension**
 Load the extension manually (see the relevant browser docs) and off you go!
\ No newline at end of file
diff --git a/extension/api/go-webserial-native-msg.js b/extension/api/go-webserial-native-msg.js
index 6a25e40..12a1968 100644
--- a/extension/api/go-webserial-native-msg.js
+++ b/extension/api/go-webserial-native-msg.js
@@ -39,7 +39,7 @@ NMSerialPort = {
                     promises[i].resolve(message.data);
                 }
             }
-            NMSerialPort.openPromises.delete(message.event)
+            NMSerialPort.openPromises.delete(message.event);
         }
     },
 
@@ -58,14 +58,14 @@ NMSerialPort = {
                     promises[i].resolve(message.data);
                 }
             }
-            NMSerialPort.openPromises.delete(message.event)
+            NMSerialPort.openPromises.delete(message.event);
         }        
     },
 
     handleData: function(message)
     {
         // Decode data into typed array
-        var decodedString = atob(message.data)
+        var decodedString = atob(message.data);
         var uint8Array = new Uint8Array(decodedString.length);
         for (var i = 0; i < decodedString.length; i++)
         {
@@ -109,7 +109,7 @@ NMSerialPort = {
         // We only accept messages from this window with type set to fromgws
         if (event.source != window || event.data.type != "fromgws")
             return;
-        var message = event.data.message
+        var message = event.data.message;
         if (message.event)
         {
             switch (message.event)
diff --git a/extension/chrome_windows.reg b/extension/chrome_windows.reg
new file mode 100644
index 0000000..22f841e
--- /dev/null
+++ b/extension/chrome_windows.reg
@@ -0,0 +1,3 @@
+Windows Registry Editor Version 5.00
+[HKEY_CURRENT_USER\Software\Google\Chrome\NativeMessagingHosts\ext.gowebserial]
+@="<EXTENSION PATH>\\gowebserial_chrome.json"
\ No newline at end of file
diff --git a/extension/firefox_windows.reg b/extension/firefox_windows.reg
new file mode 100644
index 0000000..0328f4b
--- /dev/null
+++ b/extension/firefox_windows.reg
@@ -0,0 +1,3 @@
+Windows Registry Editor Version 5.00
+[HKEY_CURRENT_USER\SOFTWARE\Mozilla\NativeMessagingHosts\ext.gowebserial]
+@="<EXTENSION PATH>\\gowebserial_firefox.json"
\ No newline at end of file
diff --git a/extension/gowebserial_chrome.json b/extension/gowebserial_chrome.json
index f7cf5dd..dd51ff6 100644
--- a/extension/gowebserial_chrome.json
+++ b/extension/gowebserial_chrome.json
@@ -1,5 +1,5 @@
 {
-  "name": "gowebserial",
+  "name": "ext.gowebserial",
   "description": "Webserial native app addon",
   "path": "<GO BIN PATH>\\go-webserial-native-msg.exe",
   "type": "stdio",
diff --git a/extension/gowebserial.json b/extension/gowebserial_firefox.json
similarity index 86%
rename from extension/gowebserial.json
rename to extension/gowebserial_firefox.json
index 3caee25..4245e26 100644
--- a/extension/gowebserial.json
+++ b/extension/gowebserial_firefox.json
@@ -1,5 +1,5 @@
 {
-  "name": "gowebserial",
+  "name": "ext.gowebserial",
   "description": "Webserial native app addon",
   "path": "<GO BIN PATH>\\go-webserial-native-msg.exe",
   "type": "stdio",