diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
index 758b12aff..3507f37ee 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
@@ -355,7 +355,7 @@ namespace Barotrauma
             totalSize = (int)(padding.Y + padding.W);
             foreach (GUIComponent child in children)
             {
-                if (child == frame) continue;
+                if (child == frame || !child.Visible) continue;
                 totalSize += (scrollBar.IsHorizontal) ? child.Rect.Width : child.Rect.Height;
             }
 
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs b/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
index 1929837ec..95e75df25 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
@@ -83,6 +83,7 @@ namespace Barotrauma.Networking
             var textBlock = new GUITextBlock(new Rectangle(0, 0, 0, 0), line.Text, "", Alignment.TopLeft, Alignment.TopLeft, listBox, true, GUI.SmallFont);
             textBlock.Rect = new Rectangle(textBlock.Rect.X, textBlock.Rect.Y, textBlock.Rect.Width, Math.Max(13, textBlock.Rect.Height));
             textBlock.TextColor = messageColor[(int)line.Type];
+            textBlock.Visible = !msgTypeHidden[(int)line.Type];
             textBlock.CanBeFocused = false;
             textBlock.UserData = line;
 
@@ -108,7 +109,7 @@ namespace Barotrauma.Networking
 
                 textBlock.Visible = string.IsNullOrEmpty(filter) || textBlock.Text.ToLower().Contains(filter);
             }
-
+            listBox.UpdateScrollBarSize();
             listBox.BarScroll = 0.0f;
 
             return true;