diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json
index b1d8adfc..658fe87b 100644
--- a/_locales/bg/messages.json
+++ b/_locales/bg/messages.json
@@ -19,10 +19,6 @@
 		"message": "Изнасяне на стилове",
 		"description": ""
 	},
-	"styleEnabledToggleHint": {
-		"message": "Натиснете 'Alt-Enter', за да превключите състоянието и запазите стила",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Изнасяне",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 40748aa0..3034537b 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -27,10 +27,6 @@
 		"message": "Interval automatické aktualizace stylů v hodinách (0 = vypnuto)",
 		"description": ""
 	},
-	"styleEnabledToggleHint": {
-		"message": "Stiskem Alt + Enter můžete zapnout/vypnout a uložit styl",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exportovat",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 1f37cf38..281aff3d 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -43,10 +43,6 @@
 		"message": "älteste zuerst",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Drücke Alt-Enter, um den Style zu aktivieren / deaktivieren und gleichzeitig zu speichern.",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exportieren",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a02490d1..533958b5 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -934,10 +934,6 @@
     "message": "Enabled",
     "description": "Label for the enabled state of styles"
   },
-  "styleEnabledToggleHint": {
-    "message": "Press Alt-Enter to toggle the enabled/disabled state",
-    "description": "Help text for the '[x] enable' checkbox in the editor"
-  },
   "styleInstall": {
     "message": "Install '$stylename$' into Stylus?",
     "description": "Confirmation when installing a style",
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 6d436513..d056c71e 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -43,10 +43,6 @@
 		"message": "el más antiguo primero",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Pulse Alt-Intro para accionar el estado habilitado/deshabilitado y guardar el estilo",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exportar",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/et/messages.json b/_locales/et/messages.json
index 82f0a171..d166b5c8 100644
--- a/_locales/et/messages.json
+++ b/_locales/et/messages.json
@@ -39,10 +39,6 @@
 		"message": "vanemad eespool",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Vajuta Alt-Enter, et lülitada ümber lubatud/keelatud olek ja salvestada stiil",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Ekspordi",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json
index 49761b30..e03739d5 100644
--- a/_locales/hu/messages.json
+++ b/_locales/hu/messages.json
@@ -27,10 +27,6 @@
 		"message": "Stílus automatikus frissítési intervalluma órában megadva (álltsd 0-ra a kikapcsoláshoz)",
 		"description": ""
 	},
-	"styleEnabledToggleHint": {
-		"message": "Nyomj Alt-Entert az állapot engedélyezéséhez/letiltásához és a stílus mentéséhez",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Exportálás",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 46bef2d5..1acca98c 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -43,10 +43,6 @@
 		"message": "古い順",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Alt-Enterを押すと、有効/無効の状態を切り替え、スタイルを保存します",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "エクスポート",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
index c9dab98f..8e7af2a9 100644
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -43,10 +43,6 @@
 		"message": "najpierw najstarsze",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Naciśnij Alt-Enter, aby przełączyć stan włączenia lub wyłączenia i zapisać styl",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Eksportuj",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json
index 7ed2215f..904b74bd 100644
--- a/_locales/ro/messages.json
+++ b/_locales/ro/messages.json
@@ -39,10 +39,6 @@
 		"message": "cel mai vechi la început",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Apăsți Alt-Enter pentru a activa/dezactiva tema și pentru a o salva",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"installButton": {
 		"message": "Instalați tema",
 		"description": "Label for install button"
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index 1fef1f25..b008fcee 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -43,10 +43,6 @@
 		"message": "старые сверху",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "Нажмите Alt-Enter чтобы включить/выключить стиль и сохранить его.",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "Экспорт",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index d60368ac..ee59a165 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -43,10 +43,6 @@
 		"message": "最旧的优先",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "按 Alt + Enter 切换启用/禁用状态并保存样式",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "导出",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index dc5436bf..108fea7a 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -43,10 +43,6 @@
 		"message": "最舊的優先",
 		"description": "Text added to indicate that sorting a date would add the oldest entries at the top"
 	},
-	"styleEnabledToggleHint": {
-		"message": "按下 Alt + Enter 以切換啟用／停用狀態並儲存樣式",
-		"description": "Help text for the '[x] enable' checkbox in the editor"
-	},
 	"exportLabel": {
 		"message": "導出",
 		"description": "Label for the button to export a style ('edit' page) or all styles ('manage' page)"
diff --git a/edit.html b/edit.html
index c6bc7f27..a21f5a0d 100644
--- a/edit.html
+++ b/edit.html
@@ -249,7 +249,10 @@
           <a id="url" target="_blank"><svg class="svg-icon"><use xlink:href="#svg-icon-external-link"/></svg></a>
         </div>
         <div id="basic-info-enabled">
-          <label id="enabled-label" i18n-text="styleEnabledLabel" i18n-title="styleEnabledToggleHint">
+          <label id="enabled-label"
+                 i18n-text="styleEnabledLabel"
+                 i18n-title="toggleStyle"
+                 data-hotkey-tooltip="toggleStyle">
             <input type="checkbox" id="enabled" class="style-contributor">
             <svg class="svg-icon checked"><use xlink:href="#svg-icon-checked"/></svg>
           </label>
diff --git a/edit/edit.js b/edit/edit.js
index 6bbf23e2..ea5fd9f3 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -342,7 +342,6 @@ function setCleanSection(section) {
 
 function toggleStyle() {
   $('#enabled').checked = !$('#enabled').checked;
-  save();
 }
 
 function save() {
@@ -530,11 +529,6 @@ function showToMozillaHelp(event) {
   showHelp(t('styleMozillaFormatHeading'), t('styleToMozillaFormatHelp'));
 }
 
-function showToggleStyleHelp(event) {
-  event.preventDefault();
-  showHelp(t('helpAlt'), t('styleEnabledToggleHint'));
-}
-
 function showHelp(title = '', body) {
   const div = $('#help-popup');
   div.className = '';
diff --git a/edit/source-editor.js b/edit/source-editor.js
index e2def9ba..dd81521f 100644
--- a/edit/source-editor.js
+++ b/edit/source-editor.js
@@ -189,7 +189,6 @@ function createSourceEditor(style) {
     dirty.modify('enabled', style.enabled, value);
     style.enabled = value;
     updateMeta();
-    save();
   }
 
   function save() {