diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index d8ebfffea8..3048f5c56f 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -530,6 +530,14 @@ public:
 		}
 	}
 
+	virtual void OnDoubleClick(Point pt, int widget)
+	{
+		if (widget == NGWW_MATRIX) {
+			/* is the Join button enabled? */
+			if (!this->IsWidgetDisabled(NGWW_JOIN)) this->OnClick(pt, NGWW_JOIN);
+		}
+	}
+
 	virtual void OnDropdownSelect(int widget, int index)
 	{
 		switch (widget) {
@@ -1211,6 +1219,14 @@ struct NetworkLobbyWindow : public Window {
 				break;
 		}
 	}
+
+	virtual void OnDoubleClick(Point pt, int widget)
+	{
+		if (widget == NLWW_MATRIX) {
+			/* is the Join button enabled? */
+			if (!this->IsWidgetDisabled(NLWW_JOIN)) this->OnClick(pt, NLWW_JOIN);
+		}
+	}
 };
 
 static const Widget _network_lobby_window_widgets[] = {