diff --git a/locale/ubl-settings-keyboard.pot b/locale/ubl-settings-keyboard.pot
index 94558d9..f9976c7 100644
--- a/locale/ubl-settings-keyboard.pot
+++ b/locale/ubl-settings-keyboard.pot
@@ -189,3 +189,7 @@ msgstr ""
 #: source/ubl-strings.h:20
 msgid "Layout deletion"
 msgstr ""
+
+#: source/ubl-strings.h:20
+msgid "Manual input:"
+msgstr ""
diff --git a/locale/ubl-settings-keyboard_ru.po b/locale/ubl-settings-keyboard_ru.po
index 018636a..7bd27c9 100644
--- a/locale/ubl-settings-keyboard_ru.po
+++ b/locale/ubl-settings-keyboard_ru.po
@@ -191,3 +191,7 @@ msgstr "Вы уверены что хотите удалить данную ра
 #: source/ubl-strings.h:20
 msgid "Layout deletion"
 msgstr "Удаление раскладки"
+
+#: source/ubl-strings.h:20
+msgid "Manual input:"
+msgstr "Ручной выбор:"
diff --git a/source/ubl-settings-keyboard-font.c b/source/ubl-settings-keyboard-font.c
index c61470c..3b5f1de 100644
--- a/source/ubl-settings-keyboard-font.c
+++ b/source/ubl-settings-keyboard-font.c
@@ -57,6 +57,9 @@ layouts_window *yon_font_window_new(){
     GtkTreeIter iter;
     config_str parameters = yon_config_load(tty_font_command,&size);
     char *config_value = config(console_font_parameter);
+    if (yon_char_is_empty(config_value)){
+        gtk_switch_set_active(GTK_SWITCH(window->OptionsFilterCombo),0);
+    }
     for (int i=0;i<size;i++){
         yon_char_remove_last_symbol(parameters[i],'\n');
         char *found = yon_char_parsed_check_exist_begins_with(fonts,font_size,parameters[i]);
diff --git a/source/ubl-settings-keyboard-keymaps.c b/source/ubl-settings-keyboard-keymaps.c
index f0cbbaa..9f726b0 100644
--- a/source/ubl-settings-keyboard-keymaps.c
+++ b/source/ubl-settings-keyboard-keymaps.c
@@ -85,6 +85,9 @@ void yon_keymaps_open(GtkWidget *self,main_window *widgets){
     } else {
         config_value = config(console_keymap_toggle_parameter);
     }
+    if (yon_char_is_empty(config_value)){
+        gtk_switch_set_active(GTK_SWITCH(window->OptionsFilterCombo),0);
+    }
     for (int i=0;i<size;i++){
         yon_char_remove_last_symbol(parameters[i],'\n');
         char *found = yon_char_parsed_check_exist_begins_with(keymaps,keymap_size,parameters[i]);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index e0ecef5..2b2d16d 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -49,4 +49,5 @@
 #define OPTION_REMOVE_LABEL _("Are you sure you want to remove current option?")
 #define OPTION_REMOVE_TITLE_LABEL _("Option deletion")
 #define LAYOUT_REMOVE_LABEL _("Are you sure you want to remove current layout?")
-#define LAYOUT_REMOVE_TITLE_LABEL _("Layout deletion")
\ No newline at end of file
+#define LAYOUT_REMOVE_TITLE_LABEL _("Layout deletion")
+#define MANUAL_LABEL _("Manual input:")
\ No newline at end of file
diff --git a/ubl-settings-keyboard-keymaps.glade b/ubl-settings-keyboard-keymaps.glade
index b6788ac..23a2aaf 100644
--- a/ubl-settings-keyboard-keymaps.glade
+++ b/ubl-settings-keyboard-keymaps.glade
@@ -12,6 +12,16 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic</property>
+  </object>
   <object class="GtkWindow" id="Window">
     <property name="width-request">450</property>
     <property name="height-request">550</property>
@@ -92,9 +102,12 @@
                 <property name="model">KeymapList</property>
                 <property name="search-column">1</property>
                 <property name="enable-grid-lines">both</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
                 <child>
                   <object class="GtkTreeViewColumn">
-                    <property name="title" translatable="yes">Name</property>
+                    <property name="title" translatable="yes">Keyboard layout</property>
                     <property name="sort-column-id">0</property>
                     <child>
                       <object class="GtkCellRendererText"/>
@@ -241,14 +254,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic</property>
-  </object>
 </interface>