diff --git a/src/Main.Designer.cs b/src/Main.Designer.cs
index 2a80647..9b53a0b 100644
--- a/src/Main.Designer.cs
+++ b/src/Main.Designer.cs
@@ -156,7 +156,6 @@ private void InitializeComponent()
             this.ArchiveList.ItemActivate += new System.EventHandler(this.ArchiveList_itemAccess);
             this.ArchiveList.SelectedIndexChanged += new System.EventHandler(this.ArchiveList_itemSelect);
             this.ArchiveList.MouseMove += new System.Windows.Forms.MouseEventHandler(this.ArchiveList_mouseMove);
-            this.ArchiveList.SecondarySortColumn = this.TitleColumn;
             // 
             // TitleColumn
             // 
@@ -186,6 +185,7 @@ private void InitializeComponent()
             this.ArchiveInfoContainer.Name = "ArchiveInfoContainer";
             this.ArchiveInfoContainer.Size = new System.Drawing.Size(294, 650);
             this.ArchiveInfoContainer.TabIndex = 3;
+            this.ArchiveInfoContainer.WrapContents = false;
             // 
             // ArchiveInfoTitle
             // 
diff --git a/src/Main.cs b/src/Main.cs
index aee0b84..b871f7d 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -103,6 +103,8 @@ private void Main_load(object sender, EventArgs e)
 
             // Initialize list columns and their widths.
 
+            ArchiveList.SecondarySortColumn = TitleColumn;
+
             for (int i = 0; i < ArchiveList.Columns.Count; i++)
             {
                 columnWidths.Add(ArchiveList.Columns[i].Width);
@@ -236,8 +238,6 @@ private void ArchiveList_itemSelect(object sender, EventArgs e)
 
             ArchiveInfoDeveloper.Text = metadataOutput.Developer != "" ? $"by {metadataOutput.Developer}" : "by unknown developer";
 
-            ArchiveInfoData.Height = GetInfoHeight();
-
             /* METADATA */
 
             ArchiveInfoData.Rtf = BuildEntryData(metadataOutput);
@@ -246,10 +246,7 @@ private void ArchiveList_itemSelect(object sender, EventArgs e)
 
             if (Config.DisplayImages)
             {
-                if (!ArchiveImagesContainer.Visible)
-                {
-                    ArchiveImagesContainer.Visible = true;
-                }
+                ArchiveImagesContainer.Visible = true;
 
                 // TODO: make images persistent.
                 foreach (string folder in new string[] { "Logos", "Screenshots" })
@@ -284,6 +281,9 @@ private void ArchiveList_itemSelect(object sender, EventArgs e)
                 }
             }
 
+            // Set info height now that images are ready.
+            ArchiveInfoData.Height = GetInfoHeight();
+
             /* FOOTER */
 
             // If additional applications exist for the selected entry, display an arrow button with a menu.
@@ -1090,7 +1090,7 @@ private int GetInfoHeight()
 
             foreach (Control control in ArchiveInfoContainer.Controls)
             {
-                if (control.Name != "ArchiveInfoData")
+                if (control.Name != "ArchiveInfoData" && control.Visible)
                 {
                     desiredHeight -= control.Height;
                 }
diff --git a/src/Main.resx b/src/Main.resx
index 90961be..6e0ab83 100644
--- a/src/Main.resx
+++ b/src/Main.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
-        CQAAAk1TRnQBSQFMAgEBAgEAAaABAgGgAQIBGQEAARkBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFk
+        CQAAAk1TRnQBSQFMAgEBAgEAAagBAgGoAQIBGQEAARkBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFk
         AwABGQMAAQEBAAEYBQABTAEd/wBOAAbAIQAGwB8AAcAB8AEAAcAB8CIAAcAB8AEAAcAB8LEAA8AGAAbA
         FQAGwAYAA8AZAAHAAfABAAGAAeABAAGAAeABAAHAAfABAAHAAfAWAAHAAfABAAHAAfABAAGAAeABAAGA
         AeABAAHAAfCuAAPADAAGwAkABsAMAAPAGQABwAHwAQABgAHgAQABgAHgAQABgAHgAQABgAHgAQABwAHw