diff --git a/shell/mainwindow.cpp b/shell/mainwindow.cpp
--- a/shell/mainwindow.cpp
+++ b/shell/mainwindow.cpp
@@ -343,6 +343,15 @@
 void MainWindow::setVisible( bool visible )
 {
     KXmlGuiWindow::setVisible( visible );
+    foreach(QAction *action, actionCollection()->actions()) {
+        if (!action->shortcut().isEmpty()) {
+            QString newToolTip = action->toolTip() + " (" + action->shortcut().toString() + ")";
+            action->setToolTip(newToolTip);
+        } else if (!actionCollection()->defaultShortcut(action).isEmpty()) {
+            QString newToolTip = action->toolTip() + " (" + actionCollection()->defaultShortcut(action).toString() + ")";
+            action->setToolTip(newToolTip);
+        }
+    }
     emit finishedLoading();
 }