diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c
index fb9508a..0c2f096 100644
--- a/source/ubinstall-gtk-keyboard.c
+++ b/source/ubinstall-gtk-keyboard.c
@@ -157,6 +157,11 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){
     free(window);
 }
 
+void yon_focus_set(GtkWidget *,GtkWidget *target){
+    gtk_widget_grab_focus(target);
+
+}
+
 ubinstall_language_window *yon_ubinstall_language_new(){
 	ubinstall_language_window *window = malloc(sizeof(ubinstall_language_window));
 	GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_ubinstall_language);
@@ -171,6 +176,7 @@ ubinstall_language_window *yon_ubinstall_language_new(){
 	window->ToggleRenderer=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"ToggleRenderer"));
 
     g_signal_connect(G_OBJECT(window->DefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->LanguagesTree);
+    g_signal_connect(G_OBJECT(window->DefaultCheck),"toggled",G_CALLBACK(yon_focus_set),window->LanguagesTree);
     g_signal_connect(G_OBJECT(window->ToggleRenderer),"toggled",G_CALLBACK(yon_language_selection_changed),window);
     g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
 return window;
@@ -183,7 +189,7 @@ void on_language_clicked(GtkWidget *, main_window *widgets){
     yon_gtk_list_store_copy_full(window->liststore1,widgets->LanguagesList);
     gtk_tree_view_set_model(GTK_TREE_VIEW(window->LanguagesTree),GTK_TREE_MODEL(window->liststore1));
     yon_gtk_window_setup(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->MainWindow),TITLE_LABEL,icon_path,"language-chooser-window");
-
+    gtk_tree_view_set_search_column(GTK_TREE_VIEW(window->LanguagesTree),2);
     if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->AvailableLanguagesEntry)))){
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DefaultCheck),1);
     }
diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c
index e8ff73c..5a51c75 100644
--- a/source/ubinstall-gtk-region.c
+++ b/source/ubinstall-gtk-region.c
@@ -150,5 +150,4 @@ void yon_region_init(main_window *widgets){
     if (!yon_char_is_empty(lang_param)){
         gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguagesCombo),lang_param);
     }
-
 }
\ No newline at end of file
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 2541f38..f79b928 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -1207,4 +1207,5 @@ int yon_advanced_section_append(advanced_section *section);
 gboolean on_format_changed(GtkWidget *self,  gboolean state,  advanced_partition *part);
 int yon_layouts_get();
 void on_link(GtkWidget *self, char* uri, gpointer );
-void on_source_changed(GtkComboBox *self);
\ No newline at end of file
+void on_source_changed(GtkComboBox *self);
+void yon_focus_set(GtkWidget *,GtkWidget *target);
\ No newline at end of file
diff --git a/ubinstall-gtk-language.glade b/ubinstall-gtk-language.glade
index a1576b9..848cf11 100644
--- a/ubinstall-gtk-language.glade
+++ b/ubinstall-gtk-language.glade
@@ -75,7 +75,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="model">liststore1</property>
-                    <property name="search-column">1</property>
+                    <property name="search-column">0</property>
                     <property name="enable-grid-lines">both</property>
                     <property name="activate-on-single-click">True</property>
                     <child internal-child="selection">