2 files changed, 4 insertions, 1 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index ad8616a3..b95f85e7 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -1488,6 +1488,7 @@ static void normalize_GmDocument(iGmDocument *d) {
         appendCStr_String(normalized, "\n");
     }
     set_String(&d->source, collect_String(normalized));
+    normalize_String(&d->source); /* NFC */
 }
 
 void setUrl_GmDocument(iGmDocument *d, const iString *url) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 0dc5ffcb..32fb5ccb 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -547,7 +547,9 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     }
     clearUndo_InputWidget_(d);
     clear_Array(&d->text);
-    iConstForEach(String, i, text) {
+    iString *nfcText = collect_String(copy_String(text));
+    normalize_String(nfcText);
+    iConstForEach(String, i, nfcText) {
         pushBack_Array(&d->text, &i.value);
     }
     if (isFocused_Widget(d)) {