diff --git a/demo/adw-view-switcher-demo-window.ui b/demo/adw-view-switcher-demo-window.ui
index 28a0c10c833952d090db48b29bb7ce4c7ca33a47..e5465833825ad0a18885dfa6006c833eac6d4e7a 100644
--- a/demo/adw-view-switcher-demo-window.ui
+++ b/demo/adw-view-switcher-demo-window.ui
@@ -26,8 +26,9 @@
             <child>
               <object class="AdwViewStackPage">
                 <property name="name">page1</property>
-                <property name="title" translatable="yes">World</property>
+                <property name="title" translatable="yes">_World</property>
                 <property name="icon-name">clock-world-symbolic</property>
+                <property name="use-underline">True</property>
                 <property name="child">
                   <object class="GtkLabel">
                     <property name="margin-top">24</property>
@@ -42,8 +43,9 @@
             <child>
               <object class="AdwViewStackPage">
                 <property name="name">page2</property>
-                <property name="title" translatable="yes">Alarm</property>
+                <property name="title" translatable="yes">_Alarm</property>
                 <property name="icon-name">clock-alarm-symbolic</property>
+                <property name="use-underline">True</property>
                 <property name="child">
                   <object class="GtkLabel">
                     <property name="margin-top">24</property>
@@ -58,10 +60,11 @@
             <child>
               <object class="AdwViewStackPage">
                 <property name="name">page3</property>
-                <property name="title" translatable="yes">Stopwatch</property>
+                <property name="title" translatable="yes">_Stopwatch</property>
                 <property name="icon-name">clock-stopwatch-symbolic</property>
                 <property name="badge-number">3</property>
                 <property name="needs-attention">true</property>
+                <property name="use-underline">True</property>
                 <property name="child">
                   <object class="GtkLabel">
                     <property name="margin-top">24</property>
@@ -76,8 +79,9 @@
             <child>
               <object class="AdwViewStackPage">
                 <property name="name">page4</property>
-                <property name="title" translatable="yes">Timer</property>
+                <property name="title" translatable="yes">Tim_er</property>
                 <property name="icon-name">clock-timer-symbolic</property>
+                <property name="use-underline">True</property>
                 <property name="child">
                   <object class="GtkLabel">
                     <property name="margin-top">24</property>
diff --git a/src/adw-view-switcher-button.c b/src/adw-view-switcher-button.c
index 519e43bd9156eefdd284c4fbeb36940428e8566b..df5d3558a0dd7fb757171837761ca936dd0dc8ab 100644
--- a/src/adw-view-switcher-button.c
+++ b/src/adw-view-switcher-button.c
@@ -68,6 +68,35 @@ adw_view_switcher_button_switch_timeout (AdwViewSwitcherButton *self)
   return G_SOURCE_REMOVE;
 }
 
+static void
+update_mnemonic (AdwViewSwitcherButton *self)
+{
+  GtkLabel *label;
+
+  g_assert (ADW_IS_VIEW_SWITCHER_BUTTON (self));
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self))) {
+    if (self->orientation == GTK_ORIENTATION_VERTICAL)
+      label = self->vertical_label_active;
+    else
+      label = self->horizontal_label_active;
+  } else {
+    if (self->orientation == GTK_ORIENTATION_VERTICAL)
+      label = self->vertical_label_inactive;
+    else
+      label = self->horizontal_label_inactive;
+  }
+
+  gtk_label_set_mnemonic_widget (self->horizontal_label_active,
+                                 (label == self->horizontal_label_active) ? GTK_WIDGET (self) : NULL);
+  gtk_label_set_mnemonic_widget (self->horizontal_label_inactive,
+                                 (label == self->horizontal_label_inactive) ? GTK_WIDGET (self) : NULL);
+  gtk_label_set_mnemonic_widget (self->vertical_label_active,
+                                 (label == self->vertical_label_active) ? GTK_WIDGET (self) : NULL);
+  gtk_label_set_mnemonic_widget (self->vertical_label_inactive,
+                                 (label == self->vertical_label_inactive) ? GTK_WIDGET (self) : NULL);
+}
+
 static void
 active_changed_cb (AdwViewSwitcherButton *self)
 {
@@ -80,6 +109,8 @@ active_changed_cb (AdwViewSwitcherButton *self)
     gtk_stack_set_visible_child (self->horizontal_label_stack, GTK_WIDGET (self->horizontal_label_inactive));
     gtk_stack_set_visible_child (self->vertical_label_stack, GTK_WIDGET (self->vertical_label_inactive));
   }
+
+  update_mnemonic (self);
 }
 
 static void
@@ -123,6 +154,8 @@ set_orientation (AdwViewSwitcherButton *self,
                                GTK_WIDGET (self->orientation == GTK_ORIENTATION_VERTICAL ?
                                              self->vertical_box :
                                              self->horizontal_box));
+
+  update_mnemonic (self);
 }
 
 static gchar *
@@ -368,11 +401,6 @@ adw_view_switcher_button_init (AdwViewSwitcherButton *self)
 
   gtk_widget_set_focus_on_click (GTK_WIDGET (self), FALSE);
 
-  gtk_label_set_mnemonic_widget (self->horizontal_label_active, GTK_WIDGET (self));
-  gtk_label_set_mnemonic_widget (self->horizontal_label_inactive, GTK_WIDGET (self));
-  gtk_label_set_mnemonic_widget (self->vertical_label_active, GTK_WIDGET (self));
-  gtk_label_set_mnemonic_widget (self->vertical_label_inactive, GTK_WIDGET (self));
-
   active_changed_cb (self);
 }