diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
index fbd00c54e0f..048d9e4502d 100644
--- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
@@ -24,7 +24,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
 
     private static GameLobby gameLobby;
 
-    public GameLobby getGameLobby() {
+    public static GameLobby getGameLobby() {
         return gameLobby;
     }
 
@@ -114,6 +114,8 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
                                             }
                                         });
                                     }
+                                    //update menu buttons
+                                    OnlineScreen.Lobby.update();
                                 }
                             });
                         }
diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
index 6e0fad9c9a7..614e671c479 100644
--- a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
+++ b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
@@ -15,11 +15,13 @@ import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FOptionPane;
 import forge.util.Callback;
 
+import static forge.screens.online.OnlineLobbyScreen.getGameLobby;
+
 public class OnlineMenu extends FPopupMenu {
     public enum OnlineScreen {
         Lobby("Lobby", FSkinImage.QUEST_GEAR, OnlineLobbyScreen.class),
         Chat("Chat", FSkinImage.QUEST_NOTES, OnlineChatScreen.class),
-        Disconnect("Disconnect", FSkinImage.EXILE, null);;
+        Disconnect("Disconnect", FSkinImage.DELETE, null);
  
         private final FMenuItem item;
         private final Class<? extends FScreen> screenClass;
@@ -72,6 +74,7 @@ public class OnlineMenu extends FPopupMenu {
                     return;
                 }
             }
+            update();
         }
 
         public void open() {
@@ -88,6 +91,17 @@ public class OnlineMenu extends FPopupMenu {
             initializeScreen();
             return screen;
         }
+
+        public void update(){
+            for (OnlineScreen ngs : OnlineScreen.values()) {
+                if (ngs.ordinal() == 2){ //disconect
+                    if (getGameLobby() == null)
+                        ngs.item.setEnabled(false);
+                    else
+                        ngs.item.setEnabled(true);
+                }
+            }
+        }
     }
 
     private static final ForgePreferences prefs = FModel.getPreferences();