diff --git a/tools/cabana/commands.cc b/tools/cabana/commands.cc
index e03d6d1b11..70700b33b9 100644
--- a/tools/cabana/commands.cc
+++ b/tools/cabana/commands.cc
@@ -4,24 +4,26 @@
 
 // EditMsgCommand
 
-EditMsgCommand::EditMsgCommand(const MessageId &id, const QString &title, int size, QUndoCommand *parent)
-    : id(id), new_title(title), new_size(size), QUndoCommand(parent) {
+EditMsgCommand::EditMsgCommand(const MessageId &id, const QString &name, int size, QUndoCommand *parent)
+    : id(id), new_name(name), new_size(size), QUndoCommand(parent) {
   if (auto msg = dbc()->msg(id)) {
-    old_title = msg->name;
+    old_name = msg->name;
     old_size = msg->size;
+    setText(QObject::tr("edit message %1:%2").arg(name).arg(id.address));
+  } else {
+    setText(QObject::tr("new message %1:%2").arg(name).arg(id.address));
   }
-  setText(QObject::tr("Edit message %1:%2").arg(id.address).arg(title));
 }
 
 void EditMsgCommand::undo() {
-  if (old_title.isEmpty())
+  if (old_name.isEmpty())
     dbc()->removeMsg(id);
   else
-    dbc()->updateMsg(id, old_title, old_size);
+    dbc()->updateMsg(id, old_name, old_size);
 }
 
 void EditMsgCommand::redo() {
-  dbc()->updateMsg(id, new_title, new_size);
+  dbc()->updateMsg(id, new_name, new_size);
 }
 
 // RemoveMsgCommand
@@ -29,7 +31,7 @@ void EditMsgCommand::redo() {
 RemoveMsgCommand::RemoveMsgCommand(const MessageId &id, QUndoCommand *parent) : id(id), QUndoCommand(parent) {
   if (auto msg = dbc()->msg(id)) {
     message = *msg;
-    setText(QObject::tr("Remove message %1:%2").arg(id.address).arg(message.name));
+    setText(QObject::tr("remove message %1:%2").arg(message.name).arg(id.address));
   }
 }
 
@@ -50,7 +52,7 @@ void RemoveMsgCommand::redo() {
 
 AddSigCommand::AddSigCommand(const MessageId &id, const Signal &sig, QUndoCommand *parent)
     : id(id), signal(sig), QUndoCommand(parent) {
-  setText(QObject::tr("Add signal %1 to %2").arg(sig.name).arg(id.address));
+  setText(QObject::tr("add signal %1 to %2:%3").arg(sig.name).arg(msgName(id)).arg(id.address));
 }
 
 void AddSigCommand::undo() { dbc()->removeSignal(id, signal.name); }
@@ -60,7 +62,7 @@ void AddSigCommand::redo() { dbc()->addSignal(id, signal); }
 
 RemoveSigCommand::RemoveSigCommand(const MessageId &id, const Signal *sig, QUndoCommand *parent)
     : id(id), signal(*sig), QUndoCommand(parent) {
-  setText(QObject::tr("Remove signal %1 from %2").arg(signal.name).arg(id.address));
+  setText(QObject::tr("remove signal %1 from %2:%3").arg(signal.name).arg(msgName(id)).arg(id.address));
 }
 
 void RemoveSigCommand::undo() { dbc()->addSignal(id, signal); }
@@ -70,7 +72,7 @@ void RemoveSigCommand::redo() { dbc()->removeSignal(id, signal.name); }
 
 EditSignalCommand::EditSignalCommand(const MessageId &id, const Signal *sig, const Signal &new_sig, QUndoCommand *parent)
     : id(id), old_signal(*sig), new_signal(new_sig), QUndoCommand(parent) {
-  setText(QObject::tr("Edit signal %1").arg(old_signal.name));
+  setText(QObject::tr("edit signal %1 in %2:%3").arg(old_signal.name).arg(msgName(id)).arg(id.address));
 }
 
 void EditSignalCommand::undo() { dbc()->updateSignal(id, new_signal.name, old_signal); }
diff --git a/tools/cabana/commands.h b/tools/cabana/commands.h
index 57df664974..3565211eb9 100644
--- a/tools/cabana/commands.h
+++ b/tools/cabana/commands.h
@@ -9,13 +9,13 @@ using namespace dbcmanager;
 
 class EditMsgCommand : public QUndoCommand {
 public:
-  EditMsgCommand(const MessageId &id, const QString &title, int size, QUndoCommand *parent = nullptr);
+  EditMsgCommand(const MessageId &id, const QString &name, int size, QUndoCommand *parent = nullptr);
   void undo() override;
   void redo() override;
 
 private:
   const MessageId id;
-  QString old_title, new_title;
+  QString old_name, new_name;
   int old_size = 0, new_size = 0;
 };
 
diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index 2cba29bf5e..47ad3a4a6d 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -65,6 +65,7 @@ MainWindow::MainWindow() : QMainWindow() {
   QObject::connect(can, &AbstractStream::streamStarted, this, &MainWindow::loadDBCFromFingerprint);
   QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &MainWindow::DBCFileChanged);
   QObject::connect(UndoStack::instance(), &QUndoStack::cleanChanged, this, &MainWindow::undoStackCleanChanged);
+  QObject::connect(UndoStack::instance(), &QUndoStack::indexChanged, this, &MainWindow::undoStackIndexChanged);
 }
 
 void MainWindow::createActions() {
@@ -186,7 +187,28 @@ void MainWindow::createShortcuts() {
   // TODO: add more shortcuts here.
 }
 
+void MainWindow::undoStackIndexChanged(int index) {
+  int count = UndoStack::instance()->count();
+  if (count >= 0) {
+    QString command_text;
+    if (index == count) {
+      command_text = (count == prev_undostack_count ? "Redo " : "") + UndoStack::instance()->text(index - 1);
+    } else if (index < prev_undostack_index) {
+      command_text = tr("Undo %1").arg(UndoStack::instance()->text(index));
+    } else if (index > prev_undostack_index) {
+      command_text = tr("Redo %1").arg(UndoStack::instance()->text(index - 1));
+    }
+    statusBar()->showMessage(command_text, 2000);
+  }
+  prev_undostack_index = index;
+  prev_undostack_count = count;
+}
+
 void MainWindow::undoStackCleanChanged(bool clean) {
+  if (clean) {
+    prev_undostack_index = 0;
+    prev_undostack_count = 0;
+  }
   setWindowModified(!clean);
 }
 
diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h
index e7a39adab7..85d221a231 100644
--- a/tools/cabana/mainwin.h
+++ b/tools/cabana/mainwin.h
@@ -54,6 +54,7 @@ protected:
   void setOption();
   void findSimilarBits();
   void undoStackCleanChanged(bool clean);
+  void undoStackIndexChanged(int index);
   void onlineHelp();
 
   VideoWidget *video_widget = nullptr;
@@ -70,6 +71,8 @@ protected:
   enum { MAX_RECENT_FILES = 15 };
   QAction *recent_files_acts[MAX_RECENT_FILES] = {};
   QMenu *open_recent_menu = nullptr;
+  int prev_undostack_index = 0;
+  int prev_undostack_count = 0;
   friend class OnlineHelp;
 };