diff --git a/buttons.c b/buttons.c
index 8fd11003..9c028ffd 100644
--- a/buttons.c
+++ b/buttons.c
@@ -1654,7 +1654,11 @@ void Button_Safety_resolution(void)
 
   Unselect_button(BUTTON_MAGNIFIER);
   
-  Init_mode_video(640, 400, 0,PIXEL_SIMPLE);
+  Init_mode_video(
+    Video_mode[0].Width, 
+    Video_mode[0].Height, 
+    Video_mode[0].Fullscreen,
+    PIXEL_SIMPLE);
   Current_resolution=0;
   Display_menu();
   Reposition_palette();
diff --git a/init.c b/init.c
index 5ec0a053..f943c99c 100644
--- a/init.c
+++ b/init.c
@@ -1592,14 +1592,20 @@ void Set_all_video_modes(void)
   // The first mode will have index number 0.
   // It will be the default mode if an unsupported one
   // is requested in gfx2.ini
-  #if !defined(__GP2X__)
+  #if defined(__GP2X__)
+  // Native GP2X resolution
+  Set_video_mode( 320,240,0, 1);
+  #else
   // Window mode, with default size of 640x480
   Set_video_mode( 640,480,0, 0);
   #endif
 
   Set_video_mode( 320,200,0, 1);
   Set_video_mode( 320,224,0, 1);
+  #if !defined(__GP2X__)
+  // For the GP2X, this one is already declared above.
   Set_video_mode( 320,240,0, 1);
+  #endif
   Set_video_mode( 320,256,0, 1);
   Set_video_mode( 320,270,0, 1);
   Set_video_mode( 320,282,0, 1);