diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index 2b73504..c0658dc 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -434,7 +434,7 @@ void on_repo_add_new(GtkWidget *self, dictionary *dict){
                     }
                     gtk_tree_store_append(main_config.tree_store,&child,iter);
                     gtk_tree_store_set(main_config.tree_store,&child,0,document_no_edits,1,yon_char_unite(packname,"-",packver,"-",packarch,NULL),2,filename,3,0,9,packname,10,packver,11,packarch,12,packdepends,-1);
-                    found_packages = yon_char_unite(found_packages ? yon_char_append(found_packages,",") : "",de->d_name,NULL);
+                    found_packages = yon_char_unite(found_packages ? yon_char_append(found_packages," ") : "",de->d_name,NULL);
                 }
             }
             yon_window_config_add_custom_parameter(window->path,"repos",found_packages,YON_TYPE_STRING);
@@ -608,15 +608,36 @@ GtkTreeIter *yon_repo_append(main_window *widgets, char *name, YON_REPO_LINE_TYP
             GtkTreeIter branch;
                 if (gtk_tree_model_iter_parent(model,&branch,&parentIter)){
                     GtkTreeIter repo;
-                        gtk_tree_store_append(main_config.tree_store,&iter,&branch);
-                        gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1);
-                        retIter = gtk_tree_iter_copy(&iter);
+                    char *filename;
+                    int valid = gtk_tree_model_iter_nth_child(model,&repo,&branch,0);
+                    for (;valid;valid=gtk_tree_model_iter_next(model,&repo)){
+                        gtk_tree_model_get(model,&repo,1,&filename,-1);
+                        if (!strcmp(yon_char_divide_search(yon_char_new(name_short),".pkg.tar",-1), filename)){
+                            yon_ubl_status_box_render(ALREADY_EXIST,BACKGROUND_IMAGE_FAIL_TYPE);
+                            return NULL;
+                        }
+                        free(filename);
+                    }
+                    gtk_tree_store_append(main_config.tree_store,&iter,&branch);
+                    gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1);
+                    retIter = gtk_tree_iter_copy(&iter);
                     
                 } else {
-                        gtk_tree_store_append(main_config.tree_store,&iter,&parentIter);
-                        gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1);
-                        retIter = gtk_tree_iter_copy(&iter);
+                    GtkTreeIter repo;
+                    char *filename;
+                    int valid = gtk_tree_model_iter_nth_child(model,&repo,&parentIter,0);
+                    for (;valid;valid=gtk_tree_model_iter_next(model,&repo)){
+                        gtk_tree_model_get(model,&repo,1,&filename,-1);
+                        if (!strcmp(yon_char_divide_search(yon_char_new(name_short),".pkg.tar",-1), filename)){
+                            yon_ubl_status_box_render(ALREADY_EXIST,BACKGROUND_IMAGE_FAIL_TYPE);
+                            return NULL;
+                        }
+                        free(filename);
                     }
+                    gtk_tree_store_append(main_config.tree_store,&iter,&parentIter);
+                    gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1);
+                    retIter = gtk_tree_iter_copy(&iter);
+                }
                 yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
         }
     gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&iter);
@@ -712,12 +733,12 @@ void yon_add_file(main_window *widgets){
         }
         int add = 1;
         GtkTreeIter *iter = yon_repo_append(widgets,filename,YON_REPO_LINE_FILE_TYPE);
-        gtk_tree_view_expand_to_path(GTK_TREE_VIEW(widgets->RepoTree),gtk_tree_model_get_path(GTK_TREE_MODEL(main_config.tree_store),iter));
-        gtk_tree_store_set(main_config.tree_store,iter,0,document_added,1,yon_char_unite(packname,"-",packver,"-",packarch,NULL),2,filename,3,add,9,packname,10,packver,11,packarch,12,packdepends,-1);
-
+        if (iter){
+            gtk_tree_view_expand_to_path(GTK_TREE_VIEW(widgets->RepoTree),gtk_tree_model_get_path(GTK_TREE_MODEL(main_config.tree_store),iter));
+            gtk_tree_store_set(main_config.tree_store,iter,0,document_added,1,yon_char_unite(packname,"-",packver,"-",packarch,NULL),2,filename,3,add,9,packname,10,packver,11,packarch,12,packdepends,-1);
+        }
     }
     on_tree_selection_changed(NULL,widgets);
-    yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
     on_close_subwindow(chooser);
 
 
diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index 5b94dc4..c38b90e 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -39,7 +39,7 @@
 #define LocaleName "ubl-settings-repomanager"
 typedef char* string;
 
-#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," ||sed -e 's/  */ /g' -e 's/ : /:/g' -e 's/\\n/ /g'",NULL)
+#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," |sed -e 's/  */ /g' -e 's/ : /:/g' -e 's/\\n/ /g'",NULL)
 #define get_saved_package_info_command(path,filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file $(find \"",path,"\" -name *",filename,"* -not -name *.sig |head -n 1)|sed -e 's/  */ /g' -e 's/ : /:/g' -e 's/\\n/ /g'",NULL)
 
 #define get_gpg_keys_command yon_char_unite(yon_ubl_check_root()==1 ? yon_char_unite("su - ",yon_ubl_root_user_get()," -c \"gpg --list-signatures\"",NULL):"gpg --list-signatures"," | grep '^sig 3' | cut -d' ' -f10,11,13- | sort -u |sed -e 's/[0-9]*-[0-9]*-[0-9]* //g'",NULL)
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 0903905..ca80863 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -80,4 +80,5 @@
 #define DIGITAL_SIGNATURE_LABEL _("Digital signature")
 
 #define PACKAGE_LABEL _("package")
-#define REPOSITORY_LABEL _("repository")
\ No newline at end of file
+#define REPOSITORY_LABEL _("repository")
+#define ALREADY_EXIST _("This package already exists in that repository")
\ No newline at end of file
diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot
index 84620c8..deba3f0 100644
--- a/ubl-settings-repomanager.pot
+++ b/ubl-settings-repomanager.pot
@@ -326,3 +326,7 @@ msgstr ""
 #: source/ubl-strings.h:83
 msgid "repository"
 msgstr ""
+
+#: source/ubl-strings.h:84
+msgid "This package already exists in that repository"
+msgstr ""
\ No newline at end of file
diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po
index 0a1bdfe..3e1de26 100644
--- a/ubl-settings-repomanager_ru.po
+++ b/ubl-settings-repomanager_ru.po
@@ -332,4 +332,8 @@ msgstr "пакет"
 
 #: source/ubl-strings.h:83
 msgid "repository"
-msgstr "репозиторий"
\ No newline at end of file
+msgstr "репозиторий"
+
+#: source/ubl-strings.h:84
+msgid "This package already exists in that repository"
+msgstr "Этот пакет уже присутствует в выбранном репозтории"
\ No newline at end of file