diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index d10fb45b480..cc847a88add 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -682,6 +682,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
             gamePane.watchGame(gameId);
             setActive(gamePane);
         } catch (PropertyVetoException ex) {
+            LOGGER.debug("Problem starting watching game " + gameId, ex);
         }
     }
 
@@ -1068,9 +1069,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         if (setActive) {
             setActive(tablesPane);
         } else // if other panel was already shown, mamke sure it's topmost again
-         if (topPanebefore != null) {
+        {
+            if (topPanebefore != null) {
                 setActive(topPanebefore);
             }
+        }
     }
 
     public void hideGames() {
@@ -1417,6 +1420,10 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                 break;
             case CLIENT_STOP_WATCHING:
                 session.stopWatching(userRequestMessage.getGameId());
+                GamePanel gamePanel = getGame(userRequestMessage.getGameId());
+                if (gamePanel != null) {
+                    gamePanel.removeGame();
+                }
                 removeGame(userRequestMessage.getGameId());
                 break;
             case CLIENT_EXIT:
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index c2c2b8fa79a..120bc8a49dd 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -149,7 +149,6 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
 
     private void setGUISize() {
         mainTable.getTableHeader().setFont(GUISizeHelper.tableFont);
-        mainTable.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         mainTable.setFont(GUISizeHelper.tableFont);
         mainTable.setRowHeight(GUISizeHelper.getTableRowHeight());
         cardDimension = GUISizeHelper.editorCardDimension;
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index 7d7c2fabe78..d1f4d01a5e2 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -35,7 +35,6 @@ package mage.client.deckeditor;
 
 import java.awt.Color;
 import java.awt.Cursor;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
@@ -187,7 +186,6 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 
     private void setGUISize() {
         mainTable.getTableHeader().setFont(GUISizeHelper.tableFont);
-        mainTable.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         mainTable.setFont(GUISizeHelper.tableFont);
         mainTable.setRowHeight(GUISizeHelper.getTableRowHeight());
 
diff --git a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
index bea8603e16e..bae1bb18ca4 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
@@ -104,7 +104,6 @@ public class TableWaitingDialog extends MageDialog {
 
     private void setGUISize() {
         tableSeats.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tableSeats.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         tableSeats.setFont(GUISizeHelper.tableFont);
         tableSeats.setRowHeight(GUISizeHelper.getTableRowHeight());
 
diff --git a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
index 4e11dd3faad..925a8ccf229 100644
--- a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java
@@ -123,7 +123,6 @@ public class PlayersChatPanel extends javax.swing.JPanel {
 
     private void setGUISize() {
         jTablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont);
-        jTablePlayers.getTableHeader().setPreferredSize(new Dimension((int) jTablePlayers.getTableHeader().getPreferredSize().getWidth(), GUISizeHelper.tableHeaderHeight));
         jTablePlayers.setFont(GUISizeHelper.tableFont);
         jTablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight());
         jScrollPanePlayers.getVerticalScrollBar().setPreferredSize(new Dimension(GUISizeHelper.scrollBarSize, 0));
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index 73febdc729d..41a7179c1c8 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -294,12 +294,10 @@ public class TablesPanel extends javax.swing.JPanel {
 
     private void setGUISize() {
         tableTables.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tableTables.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         tableTables.setFont(GUISizeHelper.tableFont);
         tableTables.setRowHeight(GUISizeHelper.getTableRowHeight());
 
         tableCompleted.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tableCompleted.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         tableCompleted.setFont(GUISizeHelper.tableFont);
         tableCompleted.setRowHeight(GUISizeHelper.getTableRowHeight());
 
diff --git a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
index 133e50c375f..798fb00eb1c 100644
--- a/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
+++ b/Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java
@@ -154,12 +154,10 @@ public class TournamentPanel extends javax.swing.JPanel {
 
     private void setGUISize() {
         tablePlayers.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tablePlayers.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         tablePlayers.setFont(GUISizeHelper.tableFont);
         tablePlayers.setRowHeight(GUISizeHelper.getTableRowHeight());
 
         tableMatches.getTableHeader().setFont(GUISizeHelper.tableFont);
-        tableMatches.getTableHeader().setPreferredSize(new Dimension(GUISizeHelper.tableHeaderHeight, GUISizeHelper.tableHeaderHeight));
         tableMatches.setFont(GUISizeHelper.tableFont);
         tableMatches.setRowHeight(GUISizeHelper.getTableRowHeight());