diff -r 24f2f9fa0160 -r c853e02ed663 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Thu Jan 08 13:04:04 2009 +0000
+++ b/QTfrontend/hwform.cpp	Thu Jan 08 15:26:12 2009 +0000
@@ -315,7 +315,7 @@
 	ui.Pages->setCurrentIndex(id);
 	OnPageShown(id, curid);
 	
-	if (id == ID_PAGE_NETSERVER) {
+	if (id == ID_PAGE_NETSERVER || (id == ID_PAGE_ROOMSLIST && !hwnet)) {
 		GoBack();
 	}
 	if (id == ID_PAGE_NET) {