diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index abdcee0574..69a174ce9c 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -39,13 +39,6 @@ void menu_entries_common_load_content(bool persist)
    menu->msg_force = true;
 }
 
-int menu_action_setting_set_current_string(
-      rarch_setting_t *setting, const char *str)
-{
-   strlcpy(setting->value.string, str, setting->size);
-   return menu_setting_generic(setting);
-}
-
 #ifdef HAVE_NETWORKING
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index 98941fbc7b..afdf9c90a5 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -608,7 +608,8 @@ static int action_ok_path_use_directory(const char *path,
    if (setting->type != ST_DIR)
       return -1;
 
-   menu_action_setting_set_current_string(setting, menu_path);
+   strlcpy(setting->value.string, menu_path, setting->size);
+   menu_setting_generic(setting);
    menu_list_pop_stack_by_needle(menu->menu_list, setting->name);
 
    return 0;
diff --git a/menu/menu_input.c b/menu/menu_input.c
index ff3c3b6a15..0e3111bd52 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -134,7 +134,10 @@ void menu_input_st_string_callback(void *userdata, const char *str)
       if ((current_setting = (rarch_setting_t*)
                setting_find_setting(
                   menu->list_settings, menu->keyboard.label_setting)))
-         menu_action_setting_set_current_string(current_setting, str);
+      {
+         strlcpy(current_setting->value.string, str, current_setting->size);
+         menu_setting_generic(current_setting);
+      }
       else
       {
          if (!strcmp(menu->keyboard.label_setting, "video_shader_preset_save_as"))
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 3837424e17..874f8f8d3c 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -27,9 +27,6 @@ int menu_setting_generic(rarch_setting_t *setting);
 
 int menu_setting_handler(rarch_setting_t *setting, unsigned action);
 
-int menu_action_setting_set_current_string(
-      rarch_setting_t *setting, const char *str);
-
 int menu_setting_set(unsigned type, const char *label,
       unsigned action, bool wraparound);