diff --git a/stepmania/Docs/SMLanProtocol.txt b/stepmania/Docs/SMLanProtocol.txt
index 4d0ea816ef..5b2fc5b8cf 100644
--- a/stepmania/Docs/SMLanProtocol.txt
+++ b/stepmania/Docs/SMLanProtocol.txt
@@ -141,8 +141,11 @@ CLIENT to SERVER protocol:
 
 010:	User entered/exited Network Music Selection Screen
  Size:
-    1		If this value is 1 then the user entered the screen
+    1		
 		If this value is 0 then the user exited the screen
+		If this value is 1 then the user entered the screen
+		If this value is 2 then the user entered the options screen
+		If this value is 3 then the user came from options screen
 
 011:	User has changed player options
  Size:
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 14b3a5f191..07c68e687e 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -405,7 +405,7 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		break;
 	case SM_BackFromOpts:
 		//XXX: HACK: This will causes ScreenSelectOptions to go back here.
-		NSMAN->ReportNSSOnOff(1);
+		NSMAN->ReportNSSOnOff(3);
 		GAMESTATE->m_bEditing = false;
 		NSMAN->ReportPlayerOptions();
 		break;
@@ -454,7 +454,7 @@ void ScreenNetSelectMusic::MenuLeft( PlayerNumber pn, const InputEventType type
 		break;
 	case SelectOptions:
 		//XXX: HACK: This will causes ScreenSelectOptions to go back here.
-		NSMAN->ReportNSSOnOff(0);
+		NSMAN->ReportNSSOnOff(2);
 		GAMESTATE->m_bEditing = true;
 		SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromOpts );
 		break;
@@ -502,7 +502,7 @@ void ScreenNetSelectMusic::MenuRight( PlayerNumber pn, const InputEventType type
 		break;
 	case SelectOptions:
 		//XXX: HACK: This will causes ScreenSelectOptions to go back here.
-		NSMAN->ReportNSSOnOff(0);
+		NSMAN->ReportNSSOnOff(2);
 		GAMESTATE->m_bEditing = true;
 		SCREENMAN->AddNewScreenToTop( "ScreenPlayerOptions", SM_BackFromOpts );
 		break;