diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c
index 27a8fcc..b1dcdde 100644
--- a/source/libublsettingsui-gtk3-save.c
+++ b/source/libublsettingsui-gtk3-save.c
@@ -415,8 +415,10 @@ void yon_save_window_loaded_config_init(template_saving_window *window, struct l
                         else status=1;
                         if (strstr(current->data,">")) current->data = yon_char_replace(current->data,">","<");
                         if (strstr(current->data,"<")) current->data = yon_char_replace(current->data,"<","&gt;");
+                        if (strstr(current->data,">")) current->data = yon_char_replace(current->data,">","&amp;");
                         if (strstr(dict->data,">")) dict->data = yon_char_replace(dict->data,">","&lt;");
                         if (strstr(dict->data,"<")) dict->data = yon_char_replace(dict->data,"<","&gt;");
+                        if (strstr(dict->data,"<")) dict->data = yon_char_replace(dict->data,"<","&amp;");
                         char *compare_string = yon_char_unite("<s>",(char*)dict->data,"</s>\n",(char*)current->data,NULL);
                         gtk_list_store_append(window->list,&iter);
                         gtk_list_store_set(window->list,&iter,0,status,1,current->key,2,(char*)dict->data,3,(char*)current->data,4,compare_string,6,1,7,yon_config_get_section_for_key(current->key),-1);