diff --git a/forge-gui/src/main/java/forge/interfaces/ILobbyListener.java b/forge-gui/src/main/java/forge/interfaces/ILobbyListener.java
index 74aab55bf9a..dc1f67f7218 100644
--- a/forge-gui/src/main/java/forge/interfaces/ILobbyListener.java
+++ b/forge-gui/src/main/java/forge/interfaces/ILobbyListener.java
@@ -1,9 +1,11 @@
 package forge.interfaces;
 
 import forge.match.GameLobby.GameLobbyData;
+import forge.net.client.ClientGameLobby;
 
 public interface ILobbyListener {
     void message(String source, String message);
     void update(GameLobbyData state, int slot);
     void close();
+    ClientGameLobby getLobby();
 }
diff --git a/forge-gui/src/main/java/forge/net/NetConnectUtil.java b/forge-gui/src/main/java/forge/net/NetConnectUtil.java
index 96c3632cecf..c80beca4b1d 100644
--- a/forge-gui/src/main/java/forge/net/NetConnectUtil.java
+++ b/forge-gui/src/main/java/forge/net/NetConnectUtil.java
@@ -76,6 +76,10 @@ public class NetConnectUtil {
             public final void close() {
                 // NO-OP, server can't receive close message
             }
+            @Override
+            public ClientGameLobby getLobby() {
+                return null;
+            }
         });
         chatInterface.setGameClient(new IRemote() {
             @Override
@@ -128,6 +132,10 @@ public class NetConnectUtil {
                 SOptionPane.showMessageDialog("Your connection to the host (" + url + ") was interrupted.", "Error", FSkinProp.ICO_WARNING);
                 onlineLobby.setClient(null);
             }
+            @Override
+            public ClientGameLobby getLobby() {
+                return lobby;
+            }
         });
         view.setPlayerChangeListener(new IPlayerChangeListener() {
             @Override
diff --git a/forge-gui/src/main/java/forge/net/client/FGameClient.java b/forge-gui/src/main/java/forge/net/client/FGameClient.java
index 35cf2bc6c54..7a0f563730d 100644
--- a/forge-gui/src/main/java/forge/net/client/FGameClient.java
+++ b/forge-gui/src/main/java/forge/net/client/FGameClient.java
@@ -105,6 +105,10 @@ public class FGameClient implements IToServer {
         return replies.get(event.getId());
     }
 
+    List<ILobbyListener> getLobbyListeners() {
+        return lobbyListeners;
+    }
+
     public void addLobbyListener(final ILobbyListener listener) {
         lobbyListeners.add(listener);
     }