diff --git a/paths.c b/paths.c
index 2386586658..931016d490 100644
--- a/paths.c
+++ b/paths.c
@@ -52,7 +52,7 @@ static struct string_list *subsystem_fullpaths          = NULL;
 
 static char subsystem_path[PATH_MAX_LENGTH]             = {0};
 static char path_default_shader_preset[PATH_MAX_LENGTH] = {0};
-static char path_main_basename[PATH_MAX_LENGTH]         = {0};
+static char path_main_basename[8192]                    = {0};
 static char path_content[PATH_MAX_LENGTH]               = {0};
 static char path_libretro[PATH_MAX_LENGTH]              = {0};
 static char path_config_file[PATH_MAX_LENGTH]           = {0};
diff --git a/runloop.c b/runloop.c
index b211117ab2..9f403e3d07 100644
--- a/runloop.c
+++ b/runloop.c
@@ -186,7 +186,7 @@ void runloop_msg_queue_push(const char *msg,
  **/
 static bool rarch_game_specific_options(char **output)
 {
-   char game_path[255];
+   char game_path[8192];
 
    game_path[0] ='\0';
 
diff --git a/runloop.h b/runloop.h
index 6173dc0ff3..09cb91996c 100644
--- a/runloop.h
+++ b/runloop.h
@@ -128,27 +128,27 @@ typedef struct global
 {
    struct
    {
-      char savefile[4096];
-      char savestate[4096];
-      char cheatfile[4096];
-      char ups[4096];
-      char bps[4096];
-      char ips[4096];
-      char remapfile[4096];
+      char savefile[8192];
+      char savestate[8192];
+      char cheatfile[8192];
+      char ups[8192];
+      char bps[8192];
+      char ips[8192];
+      char remapfile[8192];
    } name;
 
    /* Recording. */
    struct
    {
-      char path[4096];
-      char config[4096];
+      char path[8192];
+      char config[8192];
       unsigned width;
       unsigned height;
 
       size_t gpu_width;
       size_t gpu_height;
-      char output_dir[4096];
-      char config_dir[4096];
+      char output_dir[8192];
+      char config_dir[8192];
       bool use_output_dir;
    } record;