diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index c444022..7e3a35e 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -1100,8 +1100,14 @@ char *yon_app_chooser_open_with_sections(char *section_name, char *section_filte
         gtk_tree_model_get(GTK_TREE_MODEL(store),&iter,2,&cur_categories,-1);
         for (int i=0; i<size;i++){
             if (strstr(app_list[i].Categories,cur_categories)){
-                gtk_tree_store_append(store,&childiter,&iter);
-                gtk_tree_store_set(store,&childiter,0,app_list[i].Icon, 1,app_list[i].Name, 2, app_list[i].filename, -1);
+                if (i>0&&strcmp(app_list[i].Name,app_list[i-1].Name)){
+                    if (strstr(app_list[i].Icon,"/")){
+                        yon_char_divide(app_list[i].Icon,yon_char_find_last(app_list[i].Icon,'/'));
+                        app_list[i].Icon = yon_char_divide(app_list[i].Icon,yon_char_find_last(app_list[i].Icon,'.'));
+                    }
+                    gtk_tree_store_append(store,&childiter,&iter);
+                    gtk_tree_store_set(store,&childiter,0,app_list[i].Icon, 1,app_list[i].Name, 2, app_list[i].filename, -1);
+                }
             }
         }
     }
@@ -1116,9 +1122,11 @@ char *yon_app_chooser_open_with_sections(char *section_name, char *section_filte
                 gtk_widget_destroy(dialog);
                 return path;
             }
+        } else {
+            gtk_widget_destroy(dialog);
         }
     } else {
-        yon_subwindow_close(box);
+        gtk_widget_destroy(dialog);
     }
     
 }