diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 9c03b4010..2f7be946f 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1164,6 +1164,18 @@ void I_StartupInput(void)
 	if (M_CheckParm("-nojoy"))
 		return;
 
+	{
+		char dbpath[1024];
+		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb.txt", srb2path);
+		SDL_GameControllerAddMappingsFromFile(dbpath);
+	}
+
+	{
+		char dbpath[1024];
+		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home);
+		SDL_GameControllerAddMappingsFromFile(dbpath);
+	}
+
 	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER))
 	{
 		return;
@@ -1183,18 +1195,6 @@ void I_StartupInput(void)
 		return;
 	}
 
-	{
-		char dbpath[1024];
-		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb.txt", srb2path);
-		SDL_GameControllerAddMappingsFromFile(dbpath);
-	}
-
-	{
-		char dbpath[1024];
-		sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home);
-		SDL_GameControllerAddMappingsFromFile(dbpath);
-	}
-
 	// Upon initialization, the gamecontroller subsystem will automatically dispatch controller device added events
 	// for controllers connected before initialization.
 }