diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index 92239a9fd20c..e5ee521df683 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -66,6 +66,11 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
   public static void updateAllToolbarsImmediately() {
     for (ActionToolbarImpl toolbar : new ArrayList<ActionToolbarImpl>(ourToolbars)) {
       toolbar.updateActionsImmediately();
+      for (Component c : toolbar.getComponents()) {
+        if (c instanceof ActionButton) {
+          ((ActionButton)c).updateToolTipText();
+        }
+      }
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
index fb564e9dc435..f50e5872bed1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
@@ -25,6 +25,7 @@ import com.intellij.ide.TreeExpander;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.QuickList;
 import com.intellij.openapi.actionSystem.ex.QuickListsManager;
+import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
 import com.intellij.openapi.keymap.KeyMapBundle;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
@@ -854,6 +855,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
       }
     }
     keymapManager.setActiveKeymap(mySelectedKeymap);
+    ActionToolbarImpl.updateAllToolbarsImmediately();
   }
 
   private void ensureNonEmptyKeymapNames() throws ConfigurationException {