diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index eaae8d673..1f49cf34f 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -110,8 +110,11 @@ namespace Game {
 					}
 				}
 				if (bFound == false) {
-					--selectedItemIndex %= items.size();
-
+					if (selectedItemIndex == 0)
+						selectedItemIndex = items.size() - 1;
+					else
+						selectedItemIndex--;
+					
 					int type = 0;
 					std::string faction = "";
 					if (menu != NULL) {
@@ -120,11 +123,12 @@ namespace Game {
 					}
 					if (menu != NULL
 						&& faction == formatString(GameConstants::OBSERVER_SLOTNAME)
-						&& (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuZeta)) {
-						--selectedItemIndex %= items.size();
+						&& (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuZeta || type == ctNetwork)) {
+						if (selectedItemIndex == 0)
+							selectedItemIndex = items.size() - 1;
+						else
+							selectedItemIndex--;
 					}
-
-
 				}
 
 			}
@@ -153,7 +157,7 @@ namespace Game {
 					}
 				}
 				if (bFound == false) {
-					++selectedItemIndex %= items.size();
+					selectedItemIndex = (selectedItemIndex + 1) % items.size();
 
 					int type = 0;
 					std::string faction = "";
@@ -164,7 +168,7 @@ namespace Game {
 					if (menu != NULL
 						&& faction == formatString(GameConstants::OBSERVER_SLOTNAME)
 						&& (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuZeta)) {
-						++selectedItemIndex %= items.size();
+						selectedItemIndex = (selectedItemIndex + 1) % items.size();
 					}
 				}
 			}
diff --git a/source/glest_game/menu/menu_state_custom_game.h b/source/glest_game/menu/menu_state_custom_game.h
index 78db96821..6863176ae 100644
--- a/source/glest_game/menu/menu_state_custom_game.h
+++ b/source/glest_game/menu/menu_state_custom_game.h
@@ -361,8 +361,6 @@ namespace Game {
 		void
 			PlayNow(bool saveGame);
 
-		void
-			SetActivePlayerNameEditor();
 		void
 			cleanup();