diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 3eb2ba30c..da5da2857 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -84,7 +84,7 @@ L.U.DrawMarkerAction = L.U.BaseAction.extend({
   options: {
     helpMenu: true,
     className: 'umap-draw-marker dark',
-    tooltip: L._('Draw a marker'),
+    tooltip: `${L._('Draw a marker')} (Ctrl+M)`,
   },
 
   addHooks: function () {
@@ -96,7 +96,7 @@ L.U.DrawPolylineAction = L.U.BaseAction.extend({
   options: {
     helpMenu: true,
     className: 'umap-draw-polyline dark',
-    tooltip: L._('Draw a polyline'),
+    tooltip: `${L._('Draw a polyline')} (Ctrl+L)`,
   },
 
   addHooks: function () {
@@ -108,7 +108,7 @@ L.U.DrawPolygonAction = L.U.BaseAction.extend({
   options: {
     helpMenu: true,
     className: 'umap-draw-polygon dark',
-    tooltip: L._('Draw a polygon'),
+    tooltip: `${L._('Draw a polygone')} (Ctrl+P)`,
   },
 
   addHooks: function () {
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index 50842862b..ab16ec5c5 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -1881,27 +1881,27 @@ L.U.Map.include({
       if (this.editEnabled) {
         if (!this.isDirty) {
           items.push({
-            text: `${L._('Stop editing')} (Ctrl+E)`,
+            text: `${L._('Stop editing')} (<kbd>Ctrl+E</kbd>)`,
             callback: this.disableEdit,
           })
         }
         if (this.options.enableMarkerDraw) {
           items.push({
-            text: `${L._('Draw a marker')} (Ctrl+M)`,
+            text: `${L._('Draw a marker')} (<kbd>Ctrl+M</kbd>)`,
             callback: this.startMarker,
             context: this,
           })
         }
         if (this.options.enablePolylineDraw) {
           items.push({
-            text: `${L._('Draw a polygon')} (Ctrl+P)`,
+            text: `${L._('Draw a polygon')} (<kbd>Ctrl+P</kbd>)`,
             callback: this.startPolygon,
             context: this,
           })
         }
         if (this.options.enablePolygonDraw) {
           items.push({
-            text: `${L._('Draw a line')} (Ctrl+L)`,
+            text: `${L._('Draw a line')} (<kbd>Ctrl+L</kbd>)`,
             callback: this.startPolyline,
             context: this,
           })
@@ -1915,7 +1915,7 @@ L.U.Map.include({
         })
       } else {
         items.push({
-          text: `${L._('Start editing')} (Ctrl+E)`,
+          text: `${L._('Start editing')} (<kbd>Ctrl+E</kbd>)`,
           callback: this.enableEdit,
         })
       }