diff --git a/sc/sc3100.cpp b/sc/sc3100.cpp
index 715812719..39672782b 100755
--- a/sc/sc3100.cpp
+++ b/sc/sc3100.cpp
@@ -349,8 +349,13 @@ bool TForm_EC_editor::load_fonts()
     xvt_mem_free(family[i]);
   }  
   TList_field& lst = (TList_field&)_msk->field(F_SFONT);
+  if (!font_found)
+  {
+    warning_box("Il font %s non esiste per la stampante di default.",(const char*) form().fontname());
+    pn1.add(form().fontname());
+    pn2.add(form().fontname());
+  }
   lst.replace_items(pn1, pn2);
-  if (!font_found) warning_box("Il font %s non esiste per la stampante di default.",(const char*) form().fontname());  
   lst.set(form().fontname());
   return font_found;
 }  
@@ -662,7 +667,7 @@ bool TForm_EC_editor::edit(char s, pagetype p)
           }
         }
       }
-      if (local_dirty || _msk->dirty()!=0) dirty=TRUE;
+      if (local_dirty || _msk->dirty()!=0 || k == K_ENTER) dirty=TRUE;
       if (k==K_ESC || k==K_ENTER)
         break;
     } // End of while