diff --git a/src/usermenu.c b/src/usermenu.c
index 13749f538..ffd76004e 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -265,10 +265,9 @@ test_condition (const Widget *edit_widget, char *p, gboolean *condition)
 #ifdef USE_INTERNAL_EDIT
             if (e != NULL)
             {
-                const char *edit_filename;
 
-                edit_filename = edit_get_file_name (e);
-                *condition = mc_search (arg, DEFAULT_CHARSET, edit_filename, search_type);
+                const char *edit_filename = edit_get_file_name (e);
+                *condition = mc_search (arg, "UTF-8", edit_filename, search_type);
             }
             else
 #endif
@@ -277,11 +276,10 @@ test_condition (const Widget *edit_widget, char *p, gboolean *condition)
                     *condition = FALSE;
                 else
                 {
-                    const file_entry_t *fe;
 
-                    fe = panel_current_entry (panel);
+                    const file_entry_t *fe = panel_current_entry (panel);
                     *condition =
-                        fe != NULL && mc_search (arg, DEFAULT_CHARSET, fe->fname->str, search_type);
+                        fe != NULL && mc_search (arg, "UTF-8", fe->fname->str, search_type);
                 }
             }
             break;
@@ -295,7 +293,7 @@ test_condition (const Widget *edit_widget, char *p, gboolean *condition)
                 if (syntax_type != NULL)
                 {
                     p = extract_arg (p, arg, sizeof (arg));
-                    *condition = mc_search (arg, DEFAULT_CHARSET, syntax_type, MC_SEARCH_T_NORMAL);
+                    *condition = mc_search (arg, "UTF-8", syntax_type, MC_SEARCH_T_NORMAL);
                 }
             }
 #endif
@@ -303,7 +301,7 @@ test_condition (const Widget *edit_widget, char *p, gboolean *condition)
         case 'd':
             p = extract_arg (p, arg, sizeof (arg));
             *condition = panel != NULL
-                && mc_search (arg, DEFAULT_CHARSET, vfs_path_as_str (panel->cwd_vpath),
+                && mc_search (arg, "UTF-8", vfs_path_as_str (panel->cwd_vpath),
                               search_type);
             break;
         case 't':