diff --git a/src/resources/ui/remote-viewer-connect.ui b/src/resources/ui/remote-viewer-connect.ui
index dcd14cf..308d121 100644
--- a/src/resources/ui/remote-viewer-connect.ui
+++ b/src/resources/ui/remote-viewer-connect.ui
@@ -19,8 +19,10 @@
               <object class="GtkLabel" id="connection-address-label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Connection Address</property>
                 <property name="xalign">0</property>
+                <property name="label" translatable="yes">Connection _Address</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">connection-address-entry</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -114,10 +116,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel-button">
-                <property name="label" translatable="yes">Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -127,10 +130,11 @@
             </child>
             <child>
               <object class="GtkButton" id="connect-button">
-                <property name="label" translatable="yes">Connect</property>
+                <property name="label" translatable="yes">C_onnect</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>