diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index e8b44f1..6a951b2 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -14,8 +14,10 @@ constexpr Accel kAccels[] = {
     {GDK_KEY_a, 0, AppAction::TriggerArm, "a", "Arm or disarm the trigger", "Acquisition"},
     {GDK_KEY_t, 0, AppAction::TriggerPanel, "t", "Enable or disable trigger mode", "Acquisition"},
     {GDK_KEY_c, 0, AppAction::CursorsPane, "c", "Enable or disable the cursors", "Panes and editors"},
-    {GDK_KEY_m, 0, AppAction::ShowMeasure, "m", "Go to Measure", "Panes and editors"},
-    {GDK_KEY_g, 0, AppAction::ShowSignals, "g", "Go to Signals", "Panes and editors"},
+    {GDK_KEY_m, 0, AppAction::ShowMeasure, "m", "Open or close the Measurements page",
+     "Panes and editors"},
+    {GDK_KEY_g, 0, AppAction::ShowSignals, "g", "Open or close the Signals page",
+     "Panes and editors"},
     {GDK_KEY_l, 0, AppAction::LayoutEditor, "l", "Show or hide the layout editor",
      "Panes and editors"},
     {GDK_KEY_s, 0, AppAction::SidePanel, "s", "Show or hide the dock",
diff --git a/src/ui.cpp b/src/ui.cpp
index 46cb210..cd3aa0b 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -4893,7 +4893,7 @@ GtkWidget* build_toolbar(App& app) {
 
   app.menu_tour_row = menu_button("Guided tour", "Ctrl+T");
   gtk_widget_set_tooltip_text(app.menu_tour_row,
-                              "walk over the plot, the side panel, the trigger, the signals and "
+                              "walk over the plot, the badges, the trigger, the dock, the signals and "
                               "the status line, one step at a time");
   g_signal_connect(app.menu_tour_row, "clicked", G_CALLBACK(on_tour_clicked), &app);
   gtk_box_append(GTK_BOX(help_box), app.menu_tour_row);
diff --git a/src/ui/header-bar.ui b/src/ui/header-bar.ui
index 74248f7..7e86e20 100644
--- a/src/ui/header-bar.ui
+++ b/src/ui/header-bar.ui
@@ -47,7 +47,7 @@
     <child type="end">
       <object class="GtkToggleButton" id="sidebar_toggle">
         <property name="icon-name">sidebar-show-symbolic</property>
-        <property name="tooltip-text" translatable="yes">show the side panel</property>
+        <property name="tooltip-text" translatable="yes">show the dock</property>
         <property name="active">1</property>
       </object>
     </child>
diff --git a/src/ui/shortcuts.ui b/src/ui/shortcuts.ui
index b6cdcaf..1b41349 100644
--- a/src/ui/shortcuts.ui
+++ b/src/ui/shortcuts.ui
@@ -73,14 +73,14 @@
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
                 <property name="accelerator">m</property>
-                <property name="title" translatable="yes">Go to Measure</property>
+                <property name="title" translatable="yes">Open or close the Measurements page</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
                 <property name="accelerator">g</property>
-                <property name="title" translatable="yes">Go to Signals</property>
+                <property name="title" translatable="yes">Open or close the Signals page</property>
               </object>
             </child>
             <child>