diff --git a/src/remote_list.ui b/src/remote_list.ui
index 81fdf37..d2d7394 100644
--- a/src/remote_list.ui
+++ b/src/remote_list.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListBoxRow" id="remote_device_row">
     <property name="visible">True</property>
-    <property name="can_focus">True</property>
+    <property name="can_focus">false</property>
     <property name="activatable">false</property>
     <property name="selectable">false</property>
     <child>
diff --git a/src/window.ui b/src/window.ui
index e7a83c9..fce07ac 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -184,7 +184,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="margin_top">6</property>
                         <property name="label" translatable="yes">Other devices on the local network</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -196,6 +195,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
+                        <property name="margin_top">6</property>
                         <property name="label" translatable="yes">Drag and drop files on devices to send them</property>
                         <style>
                           <class name="dim-label"/>