1 files changed, 11 insertions, 8 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index 70a63192..b9b7daaa 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -370,7 +370,7 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
     memcpy (selected_ns_id, key, sizeof (GNUNET_HashCode));
   }
 
-  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       main_ctx->search_ns_treestore), &iter))
   {
     while (TRUE)
@@ -398,7 +398,7 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
       add_namespace_to_ts, main_ctx->search_ns_treestore);
   main_ctx->ns_callback_registered = GNUNET_YES;
 
-  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
       main_ctx->search_ns_treestore), &iter))
   {
     while (TRUE)
@@ -418,19 +418,22 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
         g_free (value);
     }
   }
-  if (!found)
+  if ( (!found) &&
+       gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+                                                      main_ctx->search_ns_treestore), &iter))
   {
-    gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
-        main_ctx->search_ns_treestore), &iter);
     gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
         0, &value, 1, &key, -1);
     found = TRUE;
   }
-  gtk_tree_selection_select_iter (gtk_tree_view_get_selection
-                                  (main_ctx->ns_selector_treeview), &iter);
+  if (found)
+    gtk_tree_selection_select_iter (gtk_tree_view_get_selection
+                                    (main_ctx->ns_selector_treeview), &iter);
   if (value != NULL)
+  {
     gtk_label_set_text (main_ctx->search_ns_label, value);
-  g_free(value);
+    g_free(value);
+  }
   GNUNET_free_non_null (selected_ns_id);
 }