1 files changed, 15 insertions, 1 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index a5067bb5..5545371b 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -354,6 +354,7 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
   GtkTreeModel *model;
   gchar *value;
   GtkTreePath *treepath;
+  GtkEntry *search_entry;
   GtkTreeRowReference *ref, *old;
 
   builder = GTK_BUILDER (user_data);
@@ -362,6 +363,10 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
   if (!toggle_button)
     return;
 
+  search_entry = GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
+  if (!search_entry)
+    return;
+
   if (!get_selected_namespace_treepath_iter_model_widget (builder, &treepath, NULL, &model, NULL))
     return;
   ref = gtk_tree_row_reference_new (model, treepath);
@@ -376,8 +381,17 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
     return;
 
   if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0,
-      &value))
+      &value) && value != NULL)
+  {
     gtk_label_set_text (sel_namespace_label, value);
+    g_free (value);
+  }
+  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2,
+      &value) && value != NULL)
+  {
+    gtk_entry_set_text (search_entry, value);
+    g_free (value);
+  }
 
   gtk_tree_path_free (treepath);