diff --git a/release.bash b/release.bash
index 6b8851e..fb03c6e 100644
--- a/release.bash
+++ b/release.bash
@@ -81,6 +81,10 @@
     # Change the extension ID
     set_manifest_field "id" "twpowertools+beta@avm99963.com"
   fi
+else
+  if [[ $browser == "gecko" ]]; then
+    set_manifest_field "name" "__MSG_appNameGecko__"
+  fi
 fi
 
 # Create ZIP file for upload to the Chrome Web Store
diff --git a/src/_locales/ca/messages.json b/src/_locales/ca/messages.json
index f1040e6..42487c3 100644
--- a/src/_locales/ca/messages.json
+++ b/src/_locales/ca/messages.json
@@ -7,6 +7,10 @@
     "message": "Eines avançades per TW (beta)",
     "description": "The extension's name for the beta version"
   },
+  "appNameGecko": {
+    "message": "Eines avançades per TW",
+    "description": "The extension's name (with a 50 character limit for Gecko)"
+  },
   "appDescription": {
     "message": "Fes scroll infinit i obtén altres millores als Fòrums de Google i la Consola de la Comunitat",
     "description": "The extension's description"
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 91fd068..0778af3 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -7,6 +7,10 @@
     "message": "TW Power Tools (beta)",
     "description": "The extension's name for the beta version"
   },
+  "appNameGecko": {
+    "message": "TW Power Tools",
+    "description": "The extension's name (with a 50 character limit for Gecko)"
+  },
   "appDescription": {
     "message": "Get infinite scroll and other enhancements in the Google Forums and the Community Console",
     "description": "The extension's description"
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
index 9caff7e..2ea91e6 100644
--- a/src/_locales/es/messages.json
+++ b/src/_locales/es/messages.json
@@ -7,6 +7,10 @@
     "message": "Herramientas avanzadas para TW (beta)",
     "description": "The extension's name for the beta version"
   },
+  "appNameGecko": {
+    "message": "Herramientas avanzadas para TW",
+    "description": "The extension's name (with a 50 character limit for Gecko)"
+  },
   "appDescription": {
     "message": "Haz scroll infinito y obtén otras mejoras en los Foros de Google y la Consola de la Comunidad",
     "description": "The extension's description"
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index d62b211..a0ba81d 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -7,6 +7,10 @@
     "message": "TW Power Tools (beta)",
     "description": "Имя расширения для бета-версии."
   },
+  "appNameGecko": {
+    "message": "TW Power Tools",
+    "description": "The extension's name (with a 50 character limit for Gecko)"
+  },
   "appDescription": {
     "message": "Получите бесконечную прокрутку и другие улучшения на Форумах Google и в Community Console",
     "description": "Описание расширения."