diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index f7a6a9aba5..be3e7aefa0 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -380,7 +380,7 @@ void main()
 				} else {
 					if (key_scancode == SCAN_CODE_ENTER) EventPopinClickOkay();
 					if (popin_string[0] != -1) {
-						edit_box_key stdcall (#popin_text, key_editbox);
+						edit_box_key_c stdcall (#popin_text, key_editbox);
 					}
 				}
 				break;
diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h
index 2dba936a92..c3c1f32c18 100644
--- a/programs/cmm/eolite/include/properties.h
+++ b/programs/cmm/eolite/include/properties.h
@@ -209,10 +209,9 @@ void properties_dialog()
 
 					case SCAN_CODE_KEY_A:
 					case SCAN_CODE_KEY_C:
-						if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) {
-							EAX = key_editbox; 
-							edit_box_key stdcall(#file_name_ed);
-							edit_box_key stdcall(#path_to_file_ed);
+						if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) { 
+							edit_box_key_c stdcall(#file_name_ed,key_editbox);
+							edit_box_key_c stdcall(#path_to_file_ed,key_editbox);
 						}
 				}
 				break;
diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h
index bfbae19288..801b10feec 100644
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -67,8 +67,7 @@ void settings_dialog()
 			case evKey:
 				GetKeys();
 				if (key_scancode==SCAN_CODE_ESC) ExitSettings();
-				EAX= key_ascii << 8;
-				edit_box_key stdcall (#path_start_ed);	
+        edit_box_key_c stdcall (#path_start_ed,key_ascii << 8);	
 				break;
 				
 			case evReDraw:
diff --git a/programs/cmm/lib/obj/box_lib.h b/programs/cmm/lib/obj/box_lib.h
index 6e8f79c35f..58863581f4 100644
--- a/programs/cmm/lib/obj/box_lib.h
+++ b/programs/cmm/lib/obj/box_lib.h
@@ -27,12 +27,14 @@ extern dword frame_draw;
 
 /* 
     Legacy support
-    For new programs need to use edit_box_key_safe   
-    TODO: change in all cmm programs edit_box_key to edit_box_key_safe,
-          after that delete #define below         
-              
+    For new programs need to use edit_box_key_safe (or edit_box_key_c
+    with a define below)   
+    TODO: change in all cmm programs edit_box_key to edit_box_key_safe (edit_box_key_c)
+          See examples in eolite and imgedit
+          
+    This define changed all edit_box_key_c to edit_box_key_safe identifier's              
 */
-#define edit_box_key  edit_box_key_safe
+#define edit_box_key_c  edit_box_key_safe
 
 #else
 #ifndef INCLUDE_DLL_H