diff --git a/RetroFE/Source/Menu/MenuMode.cpp b/RetroFE/Source/Menu/MenuMode.cpp
index ea74a95..a40caa6 100644
--- a/RetroFE/Source/Menu/MenuMode.cpp
+++ b/RetroFE/Source/Menu/MenuMode.cpp
@@ -154,9 +154,6 @@ void MenuMode::end( )
 			SDL_FreeSurface(menu_zone_surfaces[i]);
 		}
 	}
-	free(idx_menus);
-	nb_menu_zones = 0;
-
 	if(backup_hw_screen != NULL){
 		SDL_FreeSurface(backup_hw_screen);
 	}
@@ -164,6 +161,13 @@ void MenuMode::end( )
 	SDL_FreeSurface(img_arrow_top);
 	SDL_FreeSurface(img_arrow_bottom);
 
+	/// ------ Free Menu memory and reset vars -----
+	if(idx_menus){
+		free(idx_menus);
+	}
+	idx_menus=NULL;
+	nb_menu_zones = 0;
+
 	return;
 }