diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp
index a6b405e9..892f9653 100644
--- a/cockatrice/src/zoneviewwidget.cpp
+++ b/cockatrice/src/zoneviewwidget.cpp
@@ -12,6 +12,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
 	: QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player)
 {
 	setAttribute(Qt::WA_DeleteOnClose);
+	setZValue(100);
 	
 	QFont font;
 	font.setPixelSize(10);
diff --git a/common/server_game.cpp b/common/server_game.cpp
index 79ff341d..dea8bbf7 100644
--- a/common/server_game.cpp
+++ b/common/server_game.cpp
@@ -198,11 +198,12 @@ void Server_Game::removePlayer(Server_Player *player)
 {
 	players.remove(player->getPlayerId());
 	sendGameEvent(new Event_Leave(player->getPlayerId()));
+	bool spectator = player->getSpectator();
 	delete player;
 	
 	if (!getPlayerCount())
 		deleteLater();
-	else
+	else if (!spectator)
 		stopGameIfFinished();
 	qobject_cast<Server *>(parent())->broadcastGameListUpdate(this);
 }