diff --git a/shells/chrome/devtools-background.html b/shells/chrome/devtools-background.html
index 0657ee84c..1de967774 100644
--- a/shells/chrome/devtools-background.html
+++ b/shells/chrome/devtools-background.html
@@ -1 +1,2 @@
+<meta charset="utf-8">
 <script src="./build/devtools-background.js"></script>
diff --git a/shells/chrome/manifest.json b/shells/chrome/manifest.json
index 1232d49ed..339c7b649 100644
--- a/shells/chrome/manifest.json
+++ b/shells/chrome/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Vue.js devtools",
   "version": "3.1.3",
-  "description": "Chrome devtools extension for debugging Vue.js applications.",
+  "description": "Chrome and Firefox DevTools extension for debugging Vue.js applications.",
   "manifest_version": 2,
   "icons": {
     "16": "icons/16.png",
diff --git a/shells/chrome/popups/disabled.html b/shells/chrome/popups/disabled.html
index 3ba5a9f1a..8376b77a2 100644
--- a/shells/chrome/popups/disabled.html
+++ b/shells/chrome/popups/disabled.html
@@ -1,3 +1,4 @@
+<meta charset="utf-8">
 <p style="width: 200px">
   Vue.js is detected on this page.
   Devtools inspection is not available because it's in
diff --git a/shells/chrome/popups/enabled.html b/shells/chrome/popups/enabled.html
index 6ae75fc1e..60b67ef45 100644
--- a/shells/chrome/popups/enabled.html
+++ b/shells/chrome/popups/enabled.html
@@ -1,4 +1,5 @@
+<meta charset="utf-8">
 <p style="width: 180px;">
   Vue.js is detected on this page.
-  Open Chrome Devtools and look for the Vue panel.
+  Open DevTools and look for the Vue panel.
 </p>
diff --git a/shells/chrome/popups/not-found.html b/shells/chrome/popups/not-found.html
index 3016df7eb..87d22a7ce 100644
--- a/shells/chrome/popups/not-found.html
+++ b/shells/chrome/popups/not-found.html
@@ -1,3 +1,4 @@
+<meta charset="utf-8">
 <p style="white-space: nowrap">
   Vue.js not detected
 </p>
diff --git a/shells/chrome/webpack.config.js b/shells/chrome/webpack.config.js
index 8b1f24c25..d59ec74d9 100644
--- a/shells/chrome/webpack.config.js
+++ b/shells/chrome/webpack.config.js
@@ -3,7 +3,7 @@ var webpack = require('webpack')
 var alias = require('../alias')
 
 var bubleOptions = {
-  target: process.env.NODE_ENV === 'production' ? null : { chrome: 52 },
+  target: process.env.NODE_ENV === 'production' ? null : { chrome: 52, firefox: 48 },
   objectAssign: 'Object.assign'
 }
 
diff --git a/shells/dev/webpack.config.js b/shells/dev/webpack.config.js
index e0bc1306e..6919b0414 100644
--- a/shells/dev/webpack.config.js
+++ b/shells/dev/webpack.config.js
@@ -4,7 +4,7 @@ var alias = require('../alias')
 var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 
 var bubleOptions = {
-  target: { chrome: 52 },
+  target: { chrome: 52, firefox: 48 },
   objectAssign: 'Object.assign'
 }