diff --git a/ObservatoryCore/UI/CoreForm.Plugins.cs b/ObservatoryCore/UI/CoreForm.Plugins.cs
index cd7d73a..640d7c8 100644
--- a/ObservatoryCore/UI/CoreForm.Plugins.cs
+++ b/ObservatoryCore/UI/CoreForm.Plugins.cs
@@ -32,6 +32,9 @@ namespace Observatory.UI
                     PluginList.Items.Add(item);
                 }
             }
+
+            PluginList.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
+            PluginList.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize);
         }
 
         private static string PluginStatusString(PluginManager.PluginStatus status)
diff --git a/ObservatoryCore/UI/CoreForm.cs b/ObservatoryCore/UI/CoreForm.cs
index c559d9b..9019222 100644
--- a/ObservatoryCore/UI/CoreForm.cs
+++ b/ObservatoryCore/UI/CoreForm.cs
@@ -212,17 +212,11 @@ namespace Observatory.UI
 
         private void FitColumns()
         {
-            // This sizes to fit the column width to the text. However, when the listview is resized (by
-            // expanding setting sections below the list), it causes flashing/jank. Visually, it looks cleaner
-            // (because the default column sizes are too small) and helps avoid horizontal scrollbar.
-            //foreach (ColumnHeader col in PluginList.Columns)
-            //    col.Width = -2;
-
             int totalWidth = 0;
             foreach (ColumnHeader col in PluginList.Columns)
                 totalWidth += col.Width;
 
-            PluginList.Columns[3].Width += PluginList.Width - totalWidth;
+            PluginList.Columns[3].Width += PluginList.Width - totalWidth - 1 - SystemInformation.VerticalScrollBarWidth;
         }
 
         private void ReadAllButton_Click(object sender, EventArgs e)