diff --git a/src/teleportappwin.c b/src/teleportappwin.c
index 2282975..f12d184 100644
--- a/src/teleportappwin.c
+++ b/src/teleportappwin.c
@@ -20,6 +20,7 @@ struct _TeleportAppWindowPrivate
   GSettings *settings;
   GtkWidget *gears;
   GtkWidget *remote_devices_list;
+  GtkWidget *this_device_name_label;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(TeleportAppWindow, teleport_app_window, GTK_TYPE_APPLICATION_WINDOW);
@@ -41,6 +42,8 @@ teleport_app_window_init (TeleportAppWindow *win)
 
   gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->gears), menu);
 
+  gtk_label_set_text(GTK_LABEL (priv->this_device_name_label), g_get_host_name());
+
   g_object_unref (builder);
 }
 
@@ -174,8 +177,8 @@ teleport_app_window_class_init (TeleportAppWindowClass *class)
       "/org/gtk/teleportapp/window.ui");
 
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, gears);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, this_device_name_label);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportAppWindow, remote_devices_list);
-
 }
 
   TeleportAppWindow *
diff --git a/src/window.ui b/src/window.ui
index 4ab9e96..a820b08 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -83,7 +83,7 @@
                                 <property name="margin_top">6</property>
                                 <property name="margin_bottom">6</property>
                                 <child>
-                                  <object class="GtkLabel" id="this-device-name-label">
+                                  <object class="GtkLabel" id="this_device_name_label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>