diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 629b2fe8d..d0217f095 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -194,9 +194,9 @@ void CaptureContext::LoadCapture(const rdcstr &captureFile, const rdcstr &origFi
 
     // make sure we're on a consistent event before invoking viewer forms
     if(m_LastDrawcall)
-      SetEventID(viewers, m_LastDrawcall->eventId, true);
+      SetEventID(viewers, m_LastDrawcall->eventId, m_LastDrawcall->eventId, true);
     else if(!m_Drawcalls->empty())
-      SetEventID(viewers, m_Drawcalls->back().eventId, true);
+      SetEventID(viewers, m_Drawcalls->back().eventId, m_Drawcalls->back().eventId, true);
 
     GUIInvoke::blockcall(m_MainWindow, [&viewers]() {
       // notify all the registers viewers that a capture has been loaded
@@ -213,6 +213,9 @@ void CaptureContext::LoadCapture(const rdcstr &captureFile, const rdcstr &origFi
         ShowCommentView();
       RaiseDockWindow(GetCommentView()->Widget());
     }
+
+    // refresh the UI without forcing the replay
+    SetEventID({}, m_SelectedEventID, m_EventID, false);
   }
 }
 
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index 48d29f8ce..7ff93c91f 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -252,8 +252,6 @@ void EventBrowser::OnCaptureLoaded()
   ui->exportDraws->setEnabled(true);
   ui->stepPrev->setEnabled(true);
   ui->stepNext->setEnabled(true);
-
-  m_Ctx.SetEventID({this}, lastEIDDraw.first, lastEIDDraw.first);
 }
 
 void EventBrowser::OnCaptureClosed()