diff --git a/src/computer.c b/src/computer.c
index 9a8b076..4792dd9 100644
--- a/src/computer.c
+++ b/src/computer.c
@@ -514,8 +514,8 @@ inline void show_screen (int tstados) {
 
 	ordenador.tstados_counter += tstados;
 	ordenador.cicles_counter += tstados;
-
-	if (curr_frames!=jump_frames) {
+	
+	if (curr_frames<jump_frames) { //Jump the frame drawing
 		if (ordenador.tstados_counter>=69888) {
 			ordenador.tstados_counter-=69888;
 			ordenador.interr = 1;
diff --git a/src/gui_sdl.c b/src/gui_sdl.c
index d4e36bf..7bdec66 100644
--- a/src/gui_sdl.c
+++ b/src/gui_sdl.c
@@ -361,6 +361,7 @@ static void emulation_settings(void)
 			} else {
 				ordenador.tst_sample=3500000/ordenador.freq;
 				jump_frames=0;
+				curr_frames=0;
 			}
 	
 	ordenador.dblscan = !submenus[4];
diff --git a/src/menu_sdl.c b/src/menu_sdl.c
index 71aff20..3f1bc87 100644
--- a/src/menu_sdl.c
+++ b/src/menu_sdl.c
@@ -696,10 +696,10 @@ uint32_t menu_wait_key_press(void)
 				keys |= KEY_ESCAPE;
 			if (SDL_JoystickGetButton(joy, 5) != 0 ||      /* + */
 					SDL_JoystickGetButton(joy, 18) != 0)   /* C+ */
-				keys |= KEY_PAGEDOWN;
+				keys |= KEY_PAGEUP;
 			if (SDL_JoystickGetButton(joy, 4) != 0 ||      /* - */
 					SDL_JoystickGetButton(joy, 17) != 0)   /* C- */
-				keys |= KEY_PAGEUP;
+				keys |= KEY_PAGEDOWN;
 		
 		joy_bottons_last[nr][0]=SDL_JoystickGetButton(joy, 0) ;   /* A */
 		joy_bottons_last[nr][1]	=SDL_JoystickGetButton(joy, 3) ;  /* 2 */
diff --git a/src/menus.c b/src/menus.c
index b0a2d2a..306eebf 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -286,6 +286,7 @@ void settings_menu() {
 				ordenador.tst_sample=3500000/ordenador.freq;
 				ordenador.turbo = 0;
 				jump_frames=0;
+				curr_frames=0;
 			} else {
 				ordenador.tst_sample=12000000/ordenador.freq; //5,0 MHz max emulation speed for wii at full frames
 				ordenador.turbo = 1;