diff --git a/useractions.cpp b/useractions.cpp
index 51aedde899..d0462ae3d2 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -417,7 +417,7 @@ void Workspace::clientShortcutUpdated( Client* c )
         if( action == NULL ) // new shortcut
             {
             action = client_keys->addAction(QString("session:clientShortcut %1").arg(key));
-            action->setText(i18n("Activate Window (%1)", key));  // TODO: Add window title if possible?
+            action->setText(i18n("Activate Window (%1)", c->caption()));
             connect( action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
             }
         // no autoloading, since it's configured explicitly here and is not meant to be reused