diff --git a/renderdocui/Windows/APIInspector.cs b/renderdocui/Windows/APIInspector.cs
index 9d9608cac..f2fbbfce1 100644
--- a/renderdocui/Windows/APIInspector.cs
+++ b/renderdocui/Windows/APIInspector.cs
@@ -228,9 +228,6 @@ namespace renderdocui.Windows
 
         private void APIEvents_Shown(object sender, EventArgs e)
         {
-            if (m_Core.LogLoaded)
-                OnLogfileLoaded();
-
             panelSplitter.Collapsed = true;
         }
 
diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 8314d3b1f..2f28ab6f9 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -154,6 +154,8 @@ namespace renderdocui.Windows
         // this points to the 'highlighted'/current UI state.
         private UIState m_ContextUIState = null;
 
+        private bool m_Loaded = false;
+
         // this becomes a 'cancel' flag for any in-flight invokes
         // to set data. Since we can't cancel then wait on an invoke
         // from the UI thread synchronously, we can just increment this
@@ -511,11 +513,14 @@ namespace renderdocui.Windows
                             UI_SetRowsData(MeshDataStage.GSOut, contentsGSOut, 0);
 
                         camGuess_PropChanged();
+
+                        m_Loaded = true;
                     }));
                 });
             }
             else
             {
+                m_Loaded = true;
                 m_Core.Renderer.BeginInvoke((ReplayRenderer r) =>
                 {
                     if (IsDisposed) return;
@@ -527,6 +532,10 @@ namespace renderdocui.Windows
 
         public void OnEventSelected(UInt32 eventID)
         {
+            // ignore OnEventSelected until we've loaded
+            if (!m_Loaded)
+                return;
+
             ClearStoredData();
 
             var draw = m_Core.CurDrawcall;
@@ -2424,11 +2433,6 @@ namespace renderdocui.Windows
 
         private void BufferViewer_Load(object sender, EventArgs e)
         {
-            if (m_Output == null && m_Core.LogLoaded)
-            {
-                OnLogfileLoaded();
-            }
-
             matrixType.SelectedIndex = 0;
             configCamControls.Visible = false;
         }
diff --git a/renderdocui/Windows/DebugMessages.Designer.cs b/renderdocui/Windows/DebugMessages.Designer.cs
index 27ded4403..e79f79d04 100644
--- a/renderdocui/Windows/DebugMessages.Designer.cs
+++ b/renderdocui/Windows/DebugMessages.Designer.cs
@@ -219,7 +219,6 @@
             this.Controls.Add(this.toolStripContainer1);
             this.Name = "DebugMessages";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.DebugMessages_FormClosed);
-            this.Shown += new System.EventHandler(this.DebugMessages_Shown);
             ((System.ComponentModel.ISupportInitialize)(this.messages)).EndInit();
             this.rightClickMenu.ResumeLayout(false);
             this.toolStripContainer1.ContentPanel.ResumeLayout(false);
diff --git a/renderdocui/Windows/DebugMessages.cs b/renderdocui/Windows/DebugMessages.cs
index a6a98dafb..5cd784fc7 100644
--- a/renderdocui/Windows/DebugMessages.cs
+++ b/renderdocui/Windows/DebugMessages.cs
@@ -82,12 +82,6 @@ namespace renderdocui.Windows
         {
         }
 
-        private void DebugMessages_Shown(object sender, EventArgs e)
-        {
-            if (m_Core.LogLoaded)
-                OnLogfileLoaded();
-        }
-
         private void messages_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
             if (e.RowIndex < m_VisibleMessages.Count)
diff --git a/renderdocui/Windows/EventBrowser.Designer.cs b/renderdocui/Windows/EventBrowser.Designer.cs
index 8197eb4a4..079e2ad73 100644
--- a/renderdocui/Windows/EventBrowser.Designer.cs
+++ b/renderdocui/Windows/EventBrowser.Designer.cs
@@ -381,7 +381,6 @@
             this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockLeft;
             this.Text = "Event Browser";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.EventBrowser_FormClosed);
-            this.Shown += new System.EventHandler(this.EventBrowser_Shown);
             this.Leave += new System.EventHandler(this.EventBrowser_Leave);
             this.toolStripContainer1.ContentPanel.ResumeLayout(false);
             this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs
index e04293262..02b375024 100644
--- a/renderdocui/Windows/EventBrowser.cs
+++ b/renderdocui/Windows/EventBrowser.cs
@@ -624,12 +624,6 @@ namespace renderdocui.Windows
             HighlightBookmarks();
         }
 
-        private void EventBrowser_Shown(object sender, EventArgs e)
-        {
-            if (m_Core.LogLoaded)
-                OnLogfileLoaded();
-        }
-
         private void ShowJump()
         {
             HideJumpAndFind();
diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index 48ae837ab..0a69b9be6 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -452,9 +452,6 @@ namespace renderdocui.Windows
             m_Following = Following.Default;
 
             texturefilter.SelectedIndex = 0;
-
-            if (m_Core.LogLoaded)
-                OnLogfileLoaded();
         }
 
         private void UI_SetupDocks()