diff --git a/src/ui/mainscr.cpp b/src/ui/mainscr.cpp
index 359f34787..3f27fc373 100644
--- a/src/ui/mainscr.cpp
+++ b/src/ui/mainscr.cpp
@@ -76,7 +76,8 @@ static void DrawMenuButtonArea_noNetwork()
 		DrawUIButton(UI.MenuButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderMenu ? MI_FLAGS_ACTIVE : 0) |
-					 (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.MenuButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.MenuButton.X, UI.MenuButton.Y,
 					 UI.MenuButton.Text);
 	}
@@ -88,7 +89,8 @@ static void DrawMenuButtonArea_Network()
 		DrawUIButton(UI.NetworkMenuButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderNetworkMenu ? MI_FLAGS_ACTIVE : 0) |
-					 (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.NetworkMenuButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.NetworkMenuButton.X, UI.NetworkMenuButton.Y,
 					 UI.NetworkMenuButton.Text);
 	}
@@ -96,7 +98,8 @@ static void DrawMenuButtonArea_Network()
 		DrawUIButton(UI.NetworkDiplomacyButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderNetworkDiplomacy ? MI_FLAGS_ACTIVE : 0) |
-					 (GameDiplomacyButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameDiplomacyButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.NetworkDiplomacyButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.NetworkDiplomacyButton.X, UI.NetworkDiplomacyButton.Y,
 					 UI.NetworkDiplomacyButton.Text);
 	}