diff --git a/src/settings.ui b/src/settings.ui
index 0ecf3ed..566031a 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -21,7 +21,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkEntry">
+          <object class="GtkEntry" id="settings_download_directory">
             <property name="visible">True</property>
             <property name="text">~/Downloads</property>
           </object>
@@ -34,7 +34,7 @@
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="label">Browse...</property>
             <property name="margin_start">12</property>
           </object>
@@ -47,7 +47,7 @@
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Automatically enable Teleport on these networks:</property>
             <property name="margin_bottom">6</property>
@@ -62,7 +62,7 @@
         </child>
         <child>
           <object class="GtkListBox" id="general-listbox">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="can_focus">True</property>
             <property name="selection_mode">none</property>
             <child>
diff --git a/src/teleportappwin.c b/src/teleportappwin.c
index f12d184..7f8c4a4 100644
--- a/src/teleportappwin.c
+++ b/src/teleportappwin.c
@@ -31,6 +31,7 @@ teleport_app_window_init (TeleportAppWindow *win)
   TeleportAppWindowPrivate *priv;
   GtkBuilder *builder;
   GtkWidget *menu;
+  GtkEntry *downloadDir;
   mainWin = win;
 
   priv = teleport_app_window_get_instance_private (win);
@@ -39,11 +40,16 @@ teleport_app_window_init (TeleportAppWindow *win)
 
   builder = gtk_builder_new_from_resource ("/org/gtk/teleportapp/settings.ui");
   menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
+  downloadDir = GTK_ENTRY (gtk_builder_get_object (builder, "settings_download_directory"));
 
   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());
+  gtk_label_set_text (GTK_LABEL (priv->this_device_name_label), g_get_host_name());
+  gtk_entry_set_text (downloadDir, g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD));
+  gtk_entry_set_width_chars(downloadDir, 30);
 
+  //g_object_unref (menu);
+  //g_object_unref (label);
   g_object_unref (builder);
 }