diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui
index 1473db6ec..62375e5f5 100644
--- a/data/gui/accounts_window.ui
+++ b/data/gui/accounts_window.ui
@@ -17,7 +17,6 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Accounts</property>
-    <property name="default_width">800</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_accounts_window_destroy"/>
     <signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
@@ -986,8 +985,9 @@
                                             <child>
                                               <object class="GtkLabel" id="gpg_name_label1">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="selectable">True</property>
+                                                <property name="ellipsize">end</property>
                                               </object>
                                               <packing>
                                                 <property name="position">1</property>
@@ -1292,6 +1292,9 @@ You might consider to change possible firewall settings.</property>
                                     <child>
                                       <object class="GtkLabel" id="gpg_name_label2">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="selectable">True</property>
+                                        <property name="ellipsize">end</property>
                                       </object>
                                       <packing>
                                         <property name="position">1</property>
@@ -1304,6 +1307,7 @@ You might consider to change possible firewall settings.</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="use_underline">True</property>
+                                        <property name="ellipsize">end</property>
                                         <signal name="clicked" handler="on_gpg_choose_button_clicked"/>
                                       </object>
                                       <packing>
@@ -1491,7 +1495,7 @@ You might consider to change possible firewall settings.</property>
               </object>
               <packing>
                 <property name="resize">True</property>
-                <property name="shrink">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
           </object>