diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index 421600f22..c33be5125 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -131,8 +131,8 @@
                     <property name="numeric">True</property>
                     <property name="wrap">True</property>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="hour-accessible">
-                        <property name="accessible-description" translatable="yes">Hour</property>
+                      <object class="AtkObject" id="h_spinbutton-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Hour</property>
                       </object>
                     </child>
                   </object>
@@ -168,8 +168,8 @@
                     <property name="numeric">True</property>
                     <property name="wrap">True</property>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="minute-accessible">
-                        <property name="accessible-description" translatable="yes">Minute</property>
+                      <object class="AtkObject" id="m_spinbutton-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Minute</property>
                       </object>
                     </child>
                   </object>
@@ -241,6 +241,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Day</property>
+                    <property name="mnemonic_widget">day-spinbutton</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -259,6 +260,7 @@
                     <property name="is_focus">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Month</property>
+                    <property name="mnemonic_widget">month-combobox</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -276,6 +278,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Year</property>
+                    <property name="mnemonic_widget">year-spinbutton</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -295,11 +298,6 @@
                     <property name="width_chars">3</property>
                     <property name="numeric">True</property>
                     <property name="wrap">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="day-accessible">
-                        <property name="accessible-description" translatable="yes">Day</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -313,11 +311,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="model">month-liststore</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="month-accessible">
-                        <property name="accessible-description" translatable="yes">Month</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkCellRendererText" id="cellrenderertext3"/>
                       <attributes>
@@ -340,11 +333,6 @@
                     <property name="width_chars">5</property>
                     <property name="numeric">True</property>
                     <property name="wrap">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="year-accessible">
-                        <property name="accessible-description" translatable="yes">Year</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>