diff --git a/src/main/n3ds/SDL_n3ds_main.c b/src/main/n3ds/SDL_n3ds_main.c
index 244d73c39..1ccd01480 100644
--- a/src/main/n3ds/SDL_n3ds_main.c
+++ b/src/main/n3ds/SDL_n3ds_main.c
@@ -49,15 +49,11 @@ N3DS_Init(void)
 {
     osSetSpeedupEnable(true);
     romfsInit();
-    gfxInit(GSP_RGBA8_OES, GSP_RGBA8_OES, false);
-    hidInit();
 }
 
 SDL_FORCE_INLINE void
 N3DS_Quit(void)
 {
-    hidExit();
-    gfxExit();
     romfsExit();
 }
 
diff --git a/src/video/n3ds/SDL_n3dsvideo.c b/src/video/n3ds/SDL_n3dsvideo.c
index cd5e01068..e3f79cb63 100644
--- a/src/video/n3ds/SDL_n3dsvideo.c
+++ b/src/video/n3ds/SDL_n3dsvideo.c
@@ -95,6 +95,9 @@ VideoBootStrap N3DS_bootstrap = { N3DSVID_DRIVER_NAME, "N3DS Video Driver", N3DS
 static int
 N3DS_VideoInit(_THIS)
 {
+    gfxInit(GSP_RGBA8_OES, GSP_RGBA8_OES, false);
+    hidInit();
+
     AddN3DSDisplay(GFX_TOP);
     AddN3DSDisplay(GFX_BOTTOM);
 
@@ -139,7 +142,9 @@ N3DS_VideoQuit(_THIS)
 {
     N3DS_SwkbQuit();
     N3DS_QuitTouch();
-    return;
+
+    hidExit();
+    gfxExit();
 }
 
 static void