diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp
index 3fa678a7..4b038e84 100644
--- a/src/app/MenuBar.cpp
+++ b/src/app/MenuBar.cpp
@@ -139,8 +139,9 @@ struct EditButton : MenuButton {
 
 		struct UndoItem : ui::MenuItem {
 			void step() override {
-				text = string::f(string::translate("MenuBar.edit.undo"), APP->history->getUndoName());
-				disabled = !APP->history->canUndo();
+				bool canUndo = APP->history->canUndo();
+				text = canUndo ? string::f(string::translate("MenuBar.edit.undoAction"), APP->history->getUndoName()) : string::translate("MenuBar.edit.undo");
+				disabled = !canUndo;
 				MenuItem::step();
 			}
 			void onAction(const ActionEvent& e) override {
@@ -151,8 +152,9 @@ struct EditButton : MenuButton {
 
 		struct RedoItem : ui::MenuItem {
 			void step() override {
-				text = string::f(string::translate("MenuBar.edit.redo"), APP->history->getRedoName());
-				disabled = !APP->history->canRedo();
+				bool canRedo = APP->history->canRedo();
+				text = canRedo ? string::f(string::translate("MenuBar.edit.redoAction"), APP->history->getRedoName()) : string::translate("MenuBar.edit.redo");
+				disabled = !canRedo;
 				MenuItem::step();
 			}
 			void onAction(const ActionEvent& e) override {
diff --git a/translations/de.json b/translations/de.json
index f7a67378..98c347cd 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "Auswahl importieren",
 	"MenuBar.file.quit": "Beenden",
 	"MenuBar.edit": "Bearbeiten",
-	"MenuBar.edit.undo": "%s rückgängig",
-	"MenuBar.edit.redo": "%s wiederholen",
+	"MenuBar.edit.undo": "Rückgängig",
+	"MenuBar.edit.undoAction": "%s rückgängig",
+	"MenuBar.edit.redo": "Wiederholen",
+	"MenuBar.edit.redoAction": "%s wiederholen",
 	"MenuBar.edit.clearCables": "Kabel entfernen",
 	"MenuBar.view": "Ansicht",
 	"MenuBar.view.zoom": "Zoom",
diff --git a/translations/en.json b/translations/en.json
index ec0b91e8..58d5f345 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "Import selection",
 	"MenuBar.file.quit": "Quit",
 	"MenuBar.edit": "Edit",
-	"MenuBar.edit.undo": "Undo %s",
-	"MenuBar.edit.redo": "Redo %s",
+	"MenuBar.edit.undo": "Undo",
+	"MenuBar.edit.undoAction": "Undo %s",
+	"MenuBar.edit.redo": "Redo",
+	"MenuBar.edit.redoAction": "Redo %s",
 	"MenuBar.edit.clearCables": "Clear cables",
 	"MenuBar.view": "View",
 	"MenuBar.view.zoom": "Zoom",
diff --git a/translations/es.json b/translations/es.json
index eb3a7774..5870c3ed 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "Importar selección",
 	"MenuBar.file.quit": "Salir",
 	"MenuBar.edit": "Editar",
-	"MenuBar.edit.undo": "Deshacer %s",
-	"MenuBar.edit.redo": "Rehacer %s",
+	"MenuBar.edit.undo": "Deshacer",
+	"MenuBar.edit.undoAction": "Deshacer %s",
+	"MenuBar.edit.redo": "Rehacer",
+	"MenuBar.edit.redoAction": "Rehacer %s",
 	"MenuBar.edit.clearCables": "Quitar cables",
 	"MenuBar.view": "Ver",
 	"MenuBar.view.zoom": "Zoom",
diff --git a/translations/fr.json b/translations/fr.json
index 99a78002..5fbc1211 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "Importer la sélection",
 	"MenuBar.file.quit": "Quitter",
 	"MenuBar.edit": "Édition",
-	"MenuBar.edit.undo": "Annuler %s",
-	"MenuBar.edit.redo": "Rétablir %s",
+	"MenuBar.edit.undo": "Annuler",
+	"MenuBar.edit.undoAction": "Annuler %s",
+	"MenuBar.edit.redo": "Rétablir",
+	"MenuBar.edit.redoAction": "Rétablir %s",
 	"MenuBar.edit.clearCables": "Déconnecter tous les câbles",
 	"MenuBar.view": "Affichage",
 	"MenuBar.view.zoom": "Zoom",
diff --git a/translations/it.json b/translations/it.json
index 5be82e22..479c9d0c 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "Importa selezione",
 	"MenuBar.file.quit": "Esci",
 	"MenuBar.edit": "Modifica",
-	"MenuBar.edit.undo": "Annulla %s",
-	"MenuBar.edit.redo": "Ripeti %s",
+	"MenuBar.edit.undo": "Annulla",
+	"MenuBar.edit.undoAction": "Annulla %s",
+	"MenuBar.edit.redo": "Ripeti",
+	"MenuBar.edit.redoAction": "Ripeti %s",
 	"MenuBar.edit.clearCables": "Rimuovi tutti i cavi",
 	"MenuBar.view": "Visualizza",
 	"MenuBar.view.zoom": "Zoom",
diff --git a/translations/ja.json b/translations/ja.json
index acbf888a..434fc952 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -95,8 +95,10 @@
 	"MenuBar.file.importSelection": "選択部分をインポート",
 	"MenuBar.file.quit": "終了",
 	"MenuBar.edit": "編集",
-	"MenuBar.edit.undo": "%s を元に戻す",
-	"MenuBar.edit.redo": "%s をやり直す",
+	"MenuBar.edit.undo": "元に戻す",
+	"MenuBar.edit.undoAction": "%sを元に戻す",
+	"MenuBar.edit.redo": "やり直す",
+	"MenuBar.edit.redoAction": "%sをやり直す",
 	"MenuBar.edit.clearCables": "ケーブルを消去",
 	"MenuBar.view": "表示",
 	"MenuBar.view.zoom": "ズーム",
diff --git a/translations/zh.json b/translations/zh.json
index 9bacb7bd..dd743432 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -95,8 +95,10 @@
     "MenuBar.file.importSelection": "导入所选文件",
     "MenuBar.file.quit": "退出",
     "MenuBar.edit": "编辑",
-    "MenuBar.edit.undo": "撤销%s",
-    "MenuBar.edit.redo": "重做%s",
+    "MenuBar.edit.undo": "撤销",
+    "MenuBar.edit.undoAction": "撤销%s",
+    "MenuBar.edit.redo": "重做",
+    "MenuBar.edit.redoAction": "重做%s",
     "MenuBar.edit.clearCables": "清理跳线",
     "MenuBar.view": "视图",
     "MenuBar.view.zoom": "缩放界面",